pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (#201)

Browse Source 
* Fixes
This commit is contained in:
Nikita Khromov
2020-10-06 19:28:10 +03:00
committed by GitHub
parent c407929be1
commit 461b5e77d3
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
checks_develop.py
View File

@ -66,7 +66,7 @@ def check_java():
def check_rabbitmq():
dependence = CDependencies()
base.print_info('Check installed RabbitMQ')
result = run_command('sc query RabbitMQ')['stdout']
result = base.run_command('sc query RabbitMQ')['stdout']
if (result.find('RabbitMQ') != -1):
print('Installed RabbitMQ is valid')
@ -85,7 +85,7 @@ def check_erlang():
erlangHome = os.getenv("ERLANG_HOME")
if (erlangHome != ""):
erlangBitness = run_command('cd ' + erlangHome + '/bin && erl -eval "erlang:display(erlang:system_info(wordsize)), halt()." -noshell')['stdout']
erlangBitness = base.run_command('"' + erlangHome + '\\bin\\erl" -eval "erlang:display(erlang:system_info(wordsize)), halt()." -noshell')['stdout']
if (erlangBitness == '8'):
print("Installed Erlang is valid")
return dependence
@ -115,7 +115,7 @@ def get_mysqlServersInfo(sParam):
arrInfo = []
try:
keyValue = r"SOFTWARE\WOW6432Node\MySQL AB"
keyValue = "SOFTWARE\\WOW6432Node\\MySQL AB"
aKey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, keyValue)
count_subkey = winreg.QueryInfoKey(aKey)[0]
@ -132,7 +132,7 @@ def check_mysqlInstaller():
dependence = CDependencies()
try:
keyValue = r"SOFTWARE\WOW6432Node\MySQL"
keyValue = "SOFTWARE\\WOW6432Node\\MySQL"
aKey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, keyValue)
count_subkey = winreg.QueryInfoKey(aKey)[0]
@ -155,7 +155,7 @@ def check_mysqlServersBitness(MySQLPaths):
if (mysqlServerPath == ""):
serversBitness.append("")
else:
result = base.run_command('cd ' + mysqlServerPath + 'bin && mysql --version')['stdout']
result = base.run_command('"' + mysqlServerPath + 'bin\\mysql" --version')['stdout']
if (result.find('for Win32') != -1):
serversBitness.append('x32')
elif (result.find('for Win64') != -1):
@ -186,12 +186,12 @@ def check_mysqlServer(serversBitness, serversVersions, serversPaths, dataPaths):
continue
elif (result == 'x64'):
print('MySQL Server bitness is valid')
connectionResult = base.run_command('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SHOW GLOBAL VARIABLES LIKE ' + r"'PORT';" + '"')['stdout']
connectionResult = base.run_command('"' + serversPaths[i] + 'bin\\mysql" -u root -ponlyoffice -e "SHOW GLOBAL VARIABLES LIKE ' + r"'PORT';" + '"')['stdout']
if (connectionResult.find('port') != -1 and connectionResult.find('3306') != -1):
if (base.run_command('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SHOW DATABASES;"')['stdout'].find('onlyoffice') == -1):
if (base.run_command('"' + serversPaths[i] + 'bin\\mysql" -u root -ponlyoffice -e "SHOW DATABASES;"')['stdout'].find('onlyoffice') == -1):
print('Database onlyoffice not found')
dependence.progsToInstall.append('MySQLDatabase')
if (base.run_command('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SELECT plugin from mysql.user where User=' + "'root';")['stdout'].find('mysql_native_password') == -1):
if (base.run_command('"' + serversPaths[i] + 'bin\\mysql" -u root -ponlyoffice -e "SELECT plugin from mysql.user where User=' + "'root';")['stdout'].find('mysql_native_password') == -1):
print('Password encryption is not valid')
dependence.progsToInstall.append('MySQLEncrypt')
dependence.pathToValidMySQLServer = serversPaths[i]
@ -208,7 +208,7 @@ def check_buildTools():
dependence = CDependencies()
base.print_info('Check installed Build Tools')
result = base.run_command(os.path.split(os.getcwd())[0] + r'\build_tools\tools\win\vswhere\vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property DisplayName')['stdout']
result = base.run_command(os.path.split(os.getcwd())[0] + '\\build_tools\\tools\\win\\vswhere\\vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property DisplayName')['stdout']
if (result == ''):
print('Build Tools not found')
dependence.progsToInstall.append('BuildTools')
@ -220,7 +220,7 @@ def check_buildTools():
def get_programDelInfoByFlag(sName, flag):
info = []
aReg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
aKey= winreg.OpenKey(aReg, r"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, winreg.KEY_READ | flag)
aKey= winreg.OpenKey(aReg, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, winreg.KEY_READ | flag)
count_subkey = winreg.QueryInfoKey(aKey)[0]
for i in range(count_subkey):

10
install_develop.py
View File

@ -94,7 +94,7 @@ def installingProgram(sProgram, sParam = ''):
return False
elif (sProgram == 'MySQLServer'):
print('Installing MySQL Server...')
code = subprocess.call('cd ' + os.path.abspath(os.sep) + 'Program Files (x86)\MySQL\MySQL Installer for Windows && MySQLInstallerConsole.exe community install server;8.0.21;x64:*:type=config;openfirewall=true;generallog=true;binlog=true;serverid=3306;enable_tcpip=true;port=3306;rootpasswd=onlyoffice -silent', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
code = subprocess.call('"' + os.path.abspath(os.sep) + 'Program Files (x86)\\MySQL\\MySQL Installer for Windows\\MySQLInstallerConsole" community install server;8.0.21;x64:*:type=config;openfirewall=true;generallog=true;binlog=true;serverid=3306;enable_tcpip=true;port=3306;rootpasswd=onlyoffice -silent', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
print(code)
if (code == 0):
print("Install success!")
@ -104,11 +104,11 @@ def installingProgram(sProgram, sParam = ''):
return False
elif (sProgram == 'MySQLDatabase'):
print('Setting database...')
subprocess.call('cd ' + sParam + 'bin && mysql -u root -ponlyoffice -e "source ' + os.getcwd() + '\schema\mysql\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('"' + sParam + 'bin\\mysql" -u root -ponlyoffice -e "source ' + os.getcwd() + '\\schema\\mysql\\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
return True
elif (sProgram == 'MySQLEncrypt'):
print('Setting MySQL password encrypting...')
subprocess.call('cd ' + sParam + 'bin && mysql -u root -ponlyoffice -e "' + "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'onlyoffice';" + '"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('"' + sParam + 'bin\\mysql" -u root -ponlyoffice -e "' + "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'onlyoffice';" + '"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
return True
elif (sProgram == "BuildTools"):
print('Installing Build Tools...')
@ -149,8 +149,8 @@ def installMySQLServer():
for i in range(len(mysqlVersions)):
if (mysqlVersions[i] == '8.0.21'):
print('Setting MySQL database...')
subprocess.call('cd ' + mysqlPaths[i] + 'bin && mysql -u root -ponlyoffice -e "source ' + os.getcwd() + '\schema\mysql\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('cd ' + mysqlPaths[i] + 'bin && mysql -u root -ponlyoffice -e "' + "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'onlyoffice';" + '"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('"' + mysqlPaths[i] + 'bin\\mysql" -u root -ponlyoffice -e "source ' + os.getcwd() + '\\schema\\mysql\\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('"' + mysqlPaths[i] + 'bin\\mysql" -u root -ponlyoffice -e "' + "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'onlyoffice';" + '"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
print('MySQL Server ' + mysqlVersions[i][0:3] + ' is valid')
return True
return False