feat: for v0.29

hidche/install/install_hidche.py

@@ -43,14 +43,18 @@ if not os.path.exists(indexPHP):
     fp.close()
 
 while True:
-    try: 
+    try:
         r = requests.head('http://web/sam/f_install/j_install_status.php')
-        if r.status_code == 200:
+        if r.status_code == 503 or r.status_code == 500:
+            b = requests.get('http://web/sam/install.php', timeout=60000)
+        elif r.status_code == 200:
             break
     except Exception:
         pass
     print("Waiting for web connection...", flush=True)
-    time.sleep(2)        
+    time.sleep(2)
+
+requests.get('http://web/sam/install.php', timeout=60000) #NPM
 
 while True:
     result = subprocess.call('nc -z -v -w30 db 3306'.split(' '), stderr=subprocess.STDOUT)
@@ -109,8 +113,8 @@ serverList.reverse()
 for serverName in serverList:
     updateResult = session.post('http://web/sam/j_updateServer.php', {
         'server':serverName,
-        'target':'origin/devel'
-    }, headers=headers)
+        'target':'origin/'+env['gameGitBranch']
+    }, headers=headers, timeout=60000)
     print(serverName, updateResult.text, flush=True)
 
     db_pw = hash_password(serverName+env['HIDCHE_PW_SALT'], env['MARIADB_ROOT_PASSWORD'])[:32]