From d59a1a05a97d456b914495d65dc9ea0c1b5bf976 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Mon, 9 Oct 2023 16:21:46 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D[Update]=20Model=20:=20batch?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E4=B8=80=E7=AE=87?= =?UTF-8?q?=E6=89=80=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- restart.bat => batch/restart.bat | 0 update.bat => batch/update.bat | 0 build.bat | 2 +- model.py | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename restart.bat => batch/restart.bat (100%) rename update.bat => batch/update.bat (100%) diff --git a/restart.bat b/batch/restart.bat similarity index 100% rename from restart.bat rename to batch/restart.bat diff --git a/update.bat b/batch/update.bat similarity index 100% rename from update.bat rename to batch/update.bat diff --git a/build.bat b/build.bat index 9c7d54fe..6dcbbf71 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -pyinstaller --onedir --onefile --windowed --clean --icon="./img/vrct_logo_mark_black.ico" --add-data "./img;img/" --add-data "./locales;locales/" --add-data "./update.bat;./" --add-data "./restart.bat;./" --name VRCT --exclude-module numpy --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 main.py \ No newline at end of file +pyinstaller --onedir --onefile --windowed --clean --icon="./img/vrct_logo_mark_black.ico" --add-data "./img;img/" --add-data "./locales;locales/" --add-data "./batch;batch/" --name VRCT --exclude-module numpy --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 main.py \ No newline at end of file diff --git a/model.py b/model.py index 2b3eaf80..292c387c 100644 --- a/model.py +++ b/model.py @@ -253,7 +253,7 @@ class Model: zf.extract(program_name, os_path.join(current_directory, tmp_directory_name)) os_rename(os_path.join(current_directory, tmp_directory_name, program_name), os_path.join(current_directory, temporary_name)) rmtree(os_path.join(current_directory, tmp_directory_name)) - command = [os_path.join(program_directory, batch_name), program_name, temporary_name, str(restart)] + command = [os_path.join(program_directory, "batch", batch_name), program_name, temporary_name, str(restart)] Popen(command) @staticmethod @@ -261,7 +261,7 @@ class Model: program_name = 'VRCT.exe' batch_name = 'restart.bat' program_directory = os_path.dirname(__file__) - command = [os_path.join(program_directory, batch_name), program_name] + command = [os_path.join(program_directory, "batch", batch_name), program_name] Popen(command) @staticmethod