Explorar o código

코드 일부 수정

잉여개발기 hai 1 ano
pai
achega
956a25bab0
Modificáronse 5 ficheiros con 7 adicións e 46 borrados
  1. 1 1
      route/main_sys_shutdown.py
  2. 0 38
      route/tool/func.py
  3. 4 0
      run_ubuntu.sh
  4. 2 0
      run_windows.bat
  5. 0 7
      ubuntu.sh

+ 1 - 1
route/main_sys_shutdown.py

@@ -10,7 +10,7 @@ async def main_sys_shutdown():
 
             print('Shutdown')
 
-            os._exit(0)
+            sys.exit()
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
                 imp = [get_lang(conn, 'wiki_shutdown'), wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],

+ 0 - 38
route/tool/func.py

@@ -30,44 +30,6 @@ if os.path.exists(os.path.join('data', 'version.json')):
     if data_load_ver == version_list['r_ver']:
         data_up_date = 0
 
-if data_up_date == 1:
-    with open(os.path.join('data', 'version.json'), 'w', encoding = 'utf8') as f:
-        f.write(version_list['r_ver'])
-    
-    if platform.system() in ('Linux', 'Darwin', 'Windows'):
-        python_ver = ''
-        python_ver = str(sys.version_info.major) + '.' + str(sys.version_info.minor)
-
-        run_list = [sys.executable, 'python' + python_ver, 'python3', 'python', 'py -' + python_ver]
-        for exe_name in run_list:
-            try:
-                subprocess.check_call([exe_name, "-m", "pip", "install", "--upgrade", "--user", "-r", "requirements.txt"])
-
-                try:
-                    os.execl(exe_name, sys.executable, *sys.argv)
-                except:
-                    pass
-
-                try:
-                    os.execl(exe_name, '"' + sys.executable + '"', *sys.argv)
-                except:
-                    pass
-
-                try:
-                    os.execl(exe_name, os.path.abspath(__file__), *sys.argv)
-                except:
-                    pass
-            except:
-                pass
-        else:
-            print('Error : automatic installation is not supported.')
-            print('Help : try "python3 -m pip install -r requirements.txt"')
-    else:
-        print('Error : automatic installation is not supported.')
-        print('Help : try "python3 -m pip install -r requirements.txt"')
-else:
-    print('PIP check pass')
-
 # Init-Load
 from .func_tool import *
 from .func_render import class_do_render

+ 4 - 0
run_ubuntu.sh

@@ -0,0 +1,4 @@
+chmod +x ./route_go/bin
+
+pip3 install --upgrade -r requirements.txt
+python3 app.py

+ 2 - 0
run_windows.bat

@@ -0,0 +1,2 @@
+pip3 install --upgrade -r requirements.txt
+python3 app.py

+ 0 - 7
ubuntu.sh

@@ -1,7 +0,0 @@
-sudo apt-get install python3
-sudo apt-get install python3-pip
-
-chmod +x ./route_go/bin
-
-pip3 install -r requirements.txt
-python3 app.py