From 57a040f6482248541a89e74ceec702cfc3dee3f6 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Tue, 31 Oct 2023 17:24:46 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D[Update]=20installer=20:=20?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E7=A7=BB=E8=A1=8C=E3=81=AE=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- batch/update.bat | 11 +++++------ model.py | 5 +---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/batch/update.bat b/batch/update.bat index cb56a4bb..7353721c 100644 --- a/batch/update.bat +++ b/batch/update.bat @@ -1,17 +1,16 @@ @if not "%~0"=="%~dp0.\%~nx0" start /min cmd /c,"%~dp0.\%~nx0" %* & goto :eof set exe_name=%1 -set exe_tmp_name=%2 -set folder_name=%3 -set folder_tmp_name=%4 -set restart=%5 +set folder_name=%2 +set folder_tmp=%3 +set restart=%4 taskkill /im %exe_name% /F ping -n 2 127.0.0.1 > nul del /f %exe_name% -rename %exe_tmp_name% %exe_name% rmdir /s /q %folder_name% -rename %folder_tmp_name% %folder_name% +move /Y %exe_tmp_name%\* .\ +rmdir /s /q %exe_tmp_name% if %restart% == True ( START "" %exe_name% diff --git a/model.py b/model.py index 119be153..24d3b770 100644 --- a/model.py +++ b/model.py @@ -286,11 +286,8 @@ class Model: file.write(chunk) with ZipFile(os_path.join(current_directory, tmp_directory_name, filename)) as zf: zf.extractall(os_path.join(current_directory, tmp_directory_name)) - move(os_path.join(current_directory, tmp_directory_name, program_name), os_path.join(current_directory, program_tmp_name)) - move(os_path.join(current_directory, tmp_directory_name, folder_name), os_path.join(current_directory, folder_tmp_name)) move(os_path.join(current_directory, folder_name, "batch", batch_name), os_path.join(current_directory, batch_name)) - rmtree(os_path.join(current_directory, tmp_directory_name)) - command = [os_path.join(current_directory, batch_name), program_name, program_tmp_name, folder_name, folder_tmp_name, str(restart)] + command = [os_path.join(current_directory, batch_name), program_name, folder_name, tmp_directory_name, str(restart)] Popen(command, cwd=current_directory) except Exception as e: print(e)