Make neorun to change default neo4j password to neo4j

If the new password is `neo4j`, then first change the default to something else and then change it back

Author: Zhen

neoctl.py

@@ -64,11 +64,7 @@ def main():
  elif opt == "--stop":
  exit_code = neo4j_stop(neo4j_home=arg) or 0
  elif opt == "--update-password":
- new_password = arg
- if new_password == 'neo4j':
- exit_code = neo4j_update_password("localhost", 7474, "neo4j", "neo4j", "1234") or neo4j_update_password("localhost", 7474, "neo4j", "1234", "neo4j") or 0
- else:
- exit_code = neo4j_update_password("localhost", 7474, "neo4j", "neo4j", new_password) or 0
+ exit_code = neo4j_update_default_password("localhost", 7474, new_password=arg) or 0
  else:
  print("Bad option %s" % opt)
  exit_code = 1
@@ -91,6 +87,16 @@ def neo4j_stop(neo4j_home):
  return call([neo4j_home+"/bin/neo4j", "stop"])
 
 
+def neo4j_update_default_password(host, http_port, new_password):
+ exit_code = 0
+ if new_password == 'neo4j':
+ exit_code = neo4j_update_password(host, http_port, "neo4j", "neo4j", "1234") \
+ or neo4j_update_password(host, http_port, "neo4j", "1234", "neo4j")
+ else:
+ exit_code = neo4j_update_password(host, http_port, "neo4j", "neo4j", new_password)
+ return exit_code
+
+
 def neo4j_update_password(host, http_port, user, password, new_password):
  request = Request("http://%s:%s/user/neo4j/password" % (host, http_port),
  json_dumps({"password": new_password}, ensure_ascii=True).encode("utf-8"),
@@ -118,4 +124,4 @@ def print_help():
  print(__doc__)
 
 if __name__ == "__main__":
- main()
+ main()

neorun.py

@@ -38,7 +38,7 @@
 import getopt
 from sys import argv, stdout, exit
 from neoget import neo4j_default_archive, neo4j_archive, download
-from neoctl import neo4j_start, neo4j_stop, neo4j_update_password
+from neoctl import neo4j_start, neo4j_stop, neo4j_update_default_password
 from os import path, rename
 import socket
 from time import time, sleep
@@ -88,7 +88,7 @@ def main():
 
  exit_code = handle_start(archive_url, archive_name, neo4j_home=arg)
  if exit_code == 0 and password is not '':
- exit_code = neo4j_update_password("localhost", 7474, "neo4j", "neo4j", new_password=start_arg) or 0
+ exit_code = neo4j_update_default_password("localhost", 7474, new_password=start_arg) or 0
 
  elif opt == "--stop":
  if neo4j_status() == ServerStatus.STOPPED: