Update install for Windows

Alain Klotz
1 parent 1bf5a7bb
Showing 1 changed file with 22 additions and 4 deletions Show diff stats
install/install.py
@@ -178,7 +178,14 @@ def install_python_modules(venv):
         python = 'py'
         pip = '\Scripts\pip'
         REQUIREMENTS = 'REQUIREMENTS_WINDOWS.txt'
-        sql_request=req + " |\"C:\Program Files\MySQL\MySQL Server 5.7\\bin\mysql\" -u root -p"
+        mysql_exe_path = "C:/Program Files (x86)/MySQL/MySQL Server 5.0/bin"
+        question = "Enter the path of the MySQL server if it is not the following name (" + mysql_exe_path + "): "
+        res = input(question)
+        if res!="":
+           mysql_exe_path = res
+        sql_req = "drop database pyros ; CREATE DATABASE pyros; drop database pyros_test ; CREATE DATABASE pyros_test; CREATE USER pyros ; GRANT USAGE ON *.* TO 'pyros'@'localhost' IDENTIFIED BY 'DjangoPyros' WITH GRANT OPTION; DROP USER 'pyros'@'localhost'; GRANT ALL ON pyros.* TO 'pyros'@'localhost' IDENTIFIED BY 'DjangoPyros'; GRANT ALL PRIVILEGES ON pyros.* TO 'pyros'@'localhost' IDENTIFIED BY 'DjangoPyros' WITH GRANT OPTION;  GRANT ALL PRIVILEGES ON pyros_test.* TO pyros@localhost IDENTIFIED BY 'DjangoPyros' WITH GRANT OPTION;"
+        mysql_call_root = "\"" + mysql_exe_path+ "/mysql\" -u root -p"
+        mysql_call_pyros = "\"" + mysql_exe_path+ "/mysql\" -u pyros -p"
     if REINSTALL:
     	print(Colors.LOG_BLUE + "-----------------------------Creating venv " + venv + "-----------------------------"+end_of_line + Colors.END)
@@ -203,9 +210,20 @@ def install_python_modules(venv):
     ## creating database and creating and granting user pyros
     #
     print(Colors.LOG_BLUE + end_of_line+"-----------------------------Launching mysql to create database and create and grant user pyros-----------------------------" + Colors.END)
-    print(Colors.LOG_BLUE +"-----------------------------Please enter your MYSQL root password-----------------------------" + Colors.END)
-    process = subprocess.Popen("echo " + sql_request, shell=True)
-    process.wait()
+    if (platform.system() == "Windows"):
+       print(Colors.LOG_BLUE +"------------------ Check if the user pyros exists in MYSQL (type the pyros password) -----------------------------" + Colors.END)
+       # We are testing if user pyros already exists in the database
+       process = subprocess.Popen("echo quit |" + mysql_call_pyros, shell=True)
+       process.wait()
+       if (process.returncode != 0):
+          # The user pyros must be created in the database
+          print(Colors.LOG_BLUE +"-----------------------------Please enter your MYSQL root password-----------------------------" + Colors.END)
+          process = subprocess.Popen("echo " + sql_req + " |"+ mysql_call_root, shell=True)
+          process.wait()
+    else:
+       print(Colors.LOG_BLUE +"-----------------------------Please enter your MYSQL root password-----------------------------" + Colors.END)
+       process = subprocess.Popen("echo " + sql_request, shell=True)
+       process.wait()
     if (process.returncode != 0):
         stderr.write(Colors.ERROR + "ERROR !: db configuration failed !" + Colors.END + "\r\n")
         return -1