ICE-6383 - remove DES crypt support and related fixes

 - rename cryptpasswd.py to hashpassword.py
 - make install installs the script to main bin directory

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 0ee9a0b73af..f0c1d56a3eb 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -828,21 +828,21 @@ def getNodeCommand():
     return nodeCmd
 
 #
-# Create a passwords file that contains the given users/passwords using cryptpasswd.py
+# Create a passwords file that contains the given users/passwords using hashpassword.py
 #
-def cryptPasswords(filePath, entries):
+def hashPasswords(filePath, entries):
     if os.path.exists(filePath):
       os.remove(filePath)
     passwords = open(filePath, "a")
     for user, password in entries.items():
         p = subprocess.Popen(
-            "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "cryptpasswd.py"))),
+            "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "hashpassword.py"))),
             shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE)
         p.stdin.write(password.encode('UTF-8'))
         p.stdin.write('\r\n'.encode('UTF-8'))
         p.stdin.flush()
         if(p.wait() != 0):
-            print("cryptpasswd.py failed:\n" + p.stdout.read().decode('UTF-8').strip())
+            print("hashpassword.py failed:\n" + p.stdout.read().decode('UTF-8').strip())
             passwords.close()
             sys.exit(1)
         passwords.write("%s %s\n" % (user, p.stdout.readline().decode('UTF-8').strip()))