Skip to content

Commit e2deda7

Browse files
committed
fix: build script execution order and bash quoting
1 parent e06ad3f commit e2deda7

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

scripts/build_win_exe.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ rmdir /s /q build 2>nul
1313
rmdir /s /q dist 2>nul
1414

1515
echo.
16-
echo [2/5] Generating version files from versioninfo.json...
16+
echo [2/6] Installing dependencies...
17+
pip install -r requirements.txt --quiet
18+
pip install pyinstaller Pillow --quiet
19+
20+
echo.
21+
echo [3/6] Generating version files from versioninfo.json...
1722
python scripts\generate_version.py
1823
if errorlevel 1 (
1924
echo ERROR: Version generation failed!
@@ -22,7 +27,7 @@ if errorlevel 1 (
2227
)
2328

2429
echo.
25-
echo [3/5] Generating Icon...
30+
echo [4/6] Generating Icon...
2631
python scripts\generate_icon.py
2732
if errorlevel 1 (
2833
echo ERROR: Icon generation failed!
@@ -31,12 +36,7 @@ if errorlevel 1 (
3136
)
3237

3338
echo.
34-
echo [4/5] Installing dependencies...
35-
pip install -r requirements.txt --quiet
36-
pip install pyinstaller Pillow --quiet
37-
38-
echo.
39-
echo [5/5] Reading Plugin Configuration...
39+
echo [5/6] Reading Plugin Configuration...
4040
set /p PLUGIN_ARGS=<build\pyinstaller_args.txt
4141
echo Plugins: %PLUGIN_ARGS%
4242

scripts/generate_version.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ def generate_version_files():
169169
# Dest: plugins/{name}
170170
# Separator for --add-data is ';' on Windows and ':' on Linux
171171
sep = os.pathsep
172-
args.append(f'--add-data "src/plugins/{plugin_name}{sep}plugins/{plugin_name}"')
172+
# Removed explicit quotation marks to allow seamless expansion in Bash & CMD
173+
args.append(f'--add-data src/plugins/{plugin_name}{sep}plugins/{plugin_name}')
173174
print(f" [+] Enabling plugin: {plugin_name}")
174175
else:
175176
print(f" [-] Skipping plugin: {plugin_name}")

0 commit comments

Comments
 (0)