Jelajahi Sumber

Merge pull request #2282 from openNAMU/dont_use

업데이트 버그 수정
잉여개발기 2 tahun lalu
induk
melakukan
54caed69b9
3 mengubah file dengan 21 tambahan dan 16 penghapusan
  1. 2 0
      route/main_sys_update.py
  2. 18 15
      route/tool/func.py
  3. 1 1
      version.json

+ 2 - 0
route/main_sys_update.py

@@ -29,6 +29,8 @@ def main_sys_update():
                     if for_a != 0:
                         break
                 else:
+                    linux_exe_chmod()
+                    
                     return redirect(conn, '/restart')
                 
                 print('Error : update failed')

+ 18 - 15
route/tool/func.py

@@ -786,27 +786,30 @@ def set_init_always(conn, ver_num, run_mode):
                 m_curs.execute('insert into temp (name, data) values ("wiki_access_password", ?)', [db_data[0][0]])
 
         # OS마다 실행 파일 설정
-        exe_type = ''
-        if platform.system() == 'Linux':
-            if platform.machine() in ["AMD64", "x86_64"]:
-                exe_type = 'main.amd64.bin'
-            else:
-                exe_type = 'main.arm64.bin'
-        else:
-            if platform.machine() in ["AMD64", "x86_64"]:
-                exe_type = 'main.amd64.exe'
-            else:
-                exe_type = 'main.arm64.exe'
-
+        exe_type = linux_exe_chmod()
         if run_mode == '':
             exe_path = os.path.join('.', 'route_go', 'bin')
-
             for for_a in os.listdir(exe_path):
                 if for_a != exe_type:
                     os.remove(os.path.join(exe_path, for_a))
 
-        if platform.system() == 'Linux':
-            os.system('chmod +x ./route_go/bin/' + exe_type)
+def linux_exe_chmod():
+    exe_type = ''
+    if platform.system() == 'Linux':
+        if platform.machine() in ["AMD64", "x86_64"]:
+            exe_type = 'main.amd64.bin'
+        else:
+            exe_type = 'main.arm64.bin'
+    else:
+        if platform.machine() in ["AMD64", "x86_64"]:
+            exe_type = 'main.amd64.exe'
+        else:
+            exe_type = 'main.arm64.exe'
+
+    if platform.system() == 'Linux':
+        os.system('chmod +x ./route_go/bin/' + exe_type)
+
+    return exe_type
 
 def set_init(conn):
     curs = conn.cursor()

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-v153",
+        "r_ver" : "v3.5.0-v154",
         "c_ver" : "20240513",
         "s_ver" : "20240426"
     }