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

Browse Source
This commit is contained in:
5weedHome
2020-09-21 18:22:02 +03:00
parent 14974e85f7
commit 03fefc6c00
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
checks_develop.py
View File

@ -4,8 +4,8 @@ import os
def check_nodejs_version():
nodejs_version = run_command('node -v')
if nodejs_version == '':
return nodejs_version
if nodejs_version.find("'node' is not recognized") != -1:
return ""
nodejs_cur_version = int(nodejs_version.split('.')[0][1:])
return nodejs_cur_version
@ -159,16 +159,16 @@ def check_mysqlServersBitness(MySQLPaths):
serversBitness.append('')
return serversBitness
def check_buildTools():
return True
def run_command(sCommand):
popen = subprocess.Popen(sCommand, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
result = ''
try:
stdout, stderr = popen.communicate()
popen.wait()
if sCommand == 'node -v':
result = stdout.strip().decode("utf-8")
else:
result = stdout.strip().decode("utf-8") + stderr.strip().decode("utf-8")
result = stdout.strip().decode("utf-8") + stderr.strip().decode("utf-8")
finally:
popen.stdout.close()
popen.stderr.close()

30
install_develop.py
View File

@ -7,6 +7,9 @@ import ctypes
import checks_develop as check
import shutil
if sys.version_info[0] >= 3:
unicode = str
def is_admin():
try:
return ctypes.windll.shell32.IsUserAnAdmin()
@ -92,6 +95,18 @@ def installingProgram(sProgram, bSilent = False):
else:
print("Error!")
return False
elif sProgram == "Build Tools":
print('Installing Build Tools...')
base.download("https://download.visualstudio.microsoft.com/download/pr/11503713/e64d79b40219aea618ce2fe10ebd5f0d/vs_BuildTools.exe", './vs_BuildTools.exe')
code = subprocess.call('vs_buildtools.exe --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --quiet --wait', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
if code == 0:
print("Install success!")
base.delete_file('./vs_buildtools.exe')
return True
else:
print("Error!")
base.delete_file('./vs_buildtools.exe')
return False
def deleteProgram(sName):
if sName == 'Erlang':
@ -196,18 +211,19 @@ def installMySQLServer(serversBitness, serversVersions, serversPaths, dataPaths)
continue
elif result == 'x32':
print('MySQL Server bitness is x32, is not valid')
deleteProgram('MySQL Server ' + serversVersions[i][0:-3])
deleteProgram('MySQL Server ' + serversVersions[i][0:2])
continue
elif result == 'x64':
connectionResult = check.run_command('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SHOW GLOBAL VARIABLES LIKE ' + r"'PORT';" + '"')
if connectionResult.find('port') != -1 and connectionResult.find('3306') != -1:
if check.run_command('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SHOW DATABESES;').find('onlyoffice') == -1:
subprocess.call('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "source ' + os.getcwd() + '\schema\mysql\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
print('MySQL Server ' + serversVersions[i][0:-3] + ' is valid')
subprocess.call('cd ' + serversPaths[i] + 'bin && mysql -u root -ponlyoffice -e "source ./schema\mysql\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('cd ' + serversPaths[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 ' + serversVersions[i][0:2] + ' is valid')
return True
else:
print('MySQL Server configuration is not valid')
deleteProgram('MySQL Server ' + serversVersions[i][0:-3])
deleteProgram('MySQL Server ' + serversVersions[i][0:2])
shutil.rmtree(dataPaths[i])
continue
@ -224,7 +240,8 @@ def installMySQLServer(serversBitness, serversVersions, serversPaths, dataPaths)
connectionResult = run_command('cd ' + dirPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SHOW GLOBAL VARIABLES LIKE ' + r"'PORT';" + '"')
if connectionResult.find('port') != -1 and connectionResult.find('3306') != -1:
if run_command('cd ' + dirPaths[i] + 'bin && mysql -u root -ponlyoffice -e "SHOW DATABESES;').find('onlyoffice') == -1:
subprocess.call('cd ' + dirPaths[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 ' + dirPaths[i] + 'bin && mysql -u root -ponlyoffice -e "source ./schema\mysql\createdb.sql"', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
subprocess.call('cd ' + dirPaths[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 8.0 is valid')
return True
else:
@ -247,7 +264,8 @@ try:
installGruntCli(check.check_gruntcli())
base.print_info('Check MySQL Server')
installMySQLServer(check.check_mysqlServersBitness(check.get_mysqlServersPaths()), check.get_mysqlServersVersions(), check.get_mysqlServersPaths(), check.get_mysqlServersDataPaths())
input()
#base.print_info('Check Build Tools')
#installMySQLServer(check.check_mysqlServersBitness(check.get_mysqlServersPaths()), check.get_mysqlServersVersions(), check.get_mysqlServersPaths(), check.get_mysqlServersDataPaths())
else:
ctypes.windll.shell32.ShellExecuteW(None, u"runas", unicode(sys.executable), unicode(''.join(sys.argv)), None, 1)
sys.exit()

6
run-develop.py
View File

@ -37,10 +37,10 @@ def run_integration_example():
base.cmd_in_dir('../document-server-integration/web/documentserver-example/nodejs', 'python', ['run-develop.py'])
try:
if os.environ['PATH'].find(sys.exec_prefix) == -1:
os.environ['PATH'] = sys.exec_prefix + os.pathsep + os.environ['PATH']
if base.get_env('PATH').find(sys.exec_prefix) == -1:
base.set_env('PATH', sys.exec_prefix + os.pathsep + base.get_env('PATH'))
base.cmd_in_dir(os.getcwd(), 'python', ['install_develop.py'])
#base.cmd_in_dir('./', 'python', ['install_develop.py'])
platform = base.host_platform()
if ("windows" == platform):