Qilan2 commited on
Commit
32db66d
·
verified ·
1 Parent(s): 9d4606f

Update server2.py

Browse files
Files changed (1) hide show
  1. server2.py +8 -6
server2.py CHANGED
@@ -192,7 +192,7 @@ def compress_folder():
192
 
193
  # 清理并创建目录 /a
194
  if os.path.exists('/a'):
195
- subprocess.run(['rm', '-r', '/a'])
196
 
197
  os.makedirs('/a', exist_ok=True)
198
 
@@ -206,10 +206,11 @@ def compress_folder():
206
  # 7z a -tzip -mx=1 -mmt=2 /a/sillytavern.zip /sillytavern/*
207
  # tar -cvf - /sillytavern | pigz -p 6 -1 > /a/sillytavern.tar.gz
208
  result = subprocess.run(
209
- f'tar -cvf - {data_folder} | pigz -p 6 -1 > {zip_file_path}',
210
- shell=True,
211
- check=True
212
  )
 
213
  print('重命名压缩后的文件')
214
  file_path = "/a/sillytavern.ctk"
215
  subprocess.run(['mv', zip_file_path,file_path])
@@ -552,6 +553,8 @@ def SillyTavern():
552
  os.system(f"tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")
553
  # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
554
 
 
 
555
 
556
  os.chdir(data_folder)
557
  os.system(f"ls {data_folder}")
@@ -564,8 +567,7 @@ def SillyTavern():
564
  print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
565
  print("Output:", e.output)
566
  os.system(f"ls {data_folder}")
567
- print('更新文件')
568
- os.system('git pull')
569
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
570
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
571
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
 
192
 
193
  # 清理并创建目录 /a
194
  if os.path.exists('/a'):
195
+ subprocess.run(['rm', '-r', '/a/*.tck'])
196
 
197
  os.makedirs('/a', exist_ok=True)
198
 
 
206
  # 7z a -tzip -mx=1 -mmt=2 /a/sillytavern.zip /sillytavern/*
207
  # tar -cvf - /sillytavern | pigz -p 6 -1 > /a/sillytavern.tar.gz
208
  result = subprocess.run(
209
+ f'tar -cvf - {data_folder} | pigz -p 6 -1 > {zip_file_path} > /dev/null',
210
+ shell=True,
211
+ check=True
212
  )
213
+
214
  print('重命名压缩后的文件')
215
  file_path = "/a/sillytavern.ctk"
216
  subprocess.run(['mv', zip_file_path,file_path])
 
553
  os.system(f"tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")
554
  # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
555
 
556
+ print('更新文件')
557
+ os.system('git pull')
558
 
559
  os.chdir(data_folder)
560
  os.system(f"ls {data_folder}")
 
567
  print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
568
  print("Output:", e.output)
569
  os.system(f"ls {data_folder}")
570
+
 
571
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
572
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
573
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)