PYROS-IRAP / pyros

Commit a1dbc688dd2adcb205b27cdfafe90227695afb4b

Authored by Unknown
1 parent f7b38c2d
Exists in dev

normalize paths

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
Inline Side-by-side
install/install.py
  Diff comments   View file @a1dbc68
... ... @@ -109,7 +109,7 @@ def install_required():
109 109 # find the linux distribution and call the related function
110 110 distribution = platform.dist()
111 111 if not 'SUDO_UID' in os.environ.keys():
112   - stderr.write("Super user rights are needed to install prerequisities\r\n")
  112 + stderr.write("Super user rights are needed to install prerequisites\r\n")
113 113 exit(1)
114 114 if distribution[0] == "Ubuntu" or distribution[0] == "Debian":
115 115 install_required_ubuntu()
... ... @@ -177,7 +177,7 @@ def install_python_modules(venv):
177 177 os.system(venv + pip+' install --upgrade wheel')
178 178 os.system(venv + pip+' install --upgrade setuptools')
179 179 if (platform.system() == "Windows"): os.system(venv + '\Scripts\pip install ../install\windows\lxml-4.1.1-cp36-cp36m-win_amd64.whl')
180   - os.system(venv + pip+' install -r ../install/'+REQUIREMENTS)
  180 + os.system(venv + pip+' install -r ../install' + os.sep + REQUIREMENTS)
181 181 print(Colors.LOG_BLUE + "-----------------------------cd ../install-----------------------------" + Colors.END)
182 182 os.chdir("../install")
183 183 '''
... ... @@ -231,7 +231,7 @@ def install_python_modules(venv):
231 231 ## replacing pattern in settings.py to use mysql
232 232 #
233 233 print(Colors.LOG_BLUE + "-----------------------------setting MYSQL = True in settings-----------------------------" + Colors.END)
234   - replacePatternInFile("MYSQL = False", "MYSQL = True", "../src/pyros/settings.py")
  234 + replacePatternInFile("MYSQL = False", "MYSQL = True", os.path.normpath("../src/pyros/settings.py"))
235 235 if (platform.system() == "Windows"):
236 236 #
237 237 ## moving voeventparse in site-packages directory
... ...