Skip to content

Commit e841306

Browse files
committed
Updated launcher for fixing the setpu args for Desktop Service
1 parent d2bccaa commit e841306

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

build

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,6 @@ export PYTHONPATH="\$RUNTIME_DIR"
6060
\$RUNTIME_DIR/bin/python3 "\$SOURCE_DIR/main.py" "\$@"
6161
EOF
6262

63-
cat > "dist/Contents/MacOS/setup.sh" <<EOF
64-
#!/bin/bash
65-
66-
DIR="\$(cd "\$(dirname "\$0")" && pwd)"
67-
RUNTIME_DIR="\$DIR/../runtime"
68-
SOURCE_DIR="\$DIR/../src"
69-
70-
export PYTHONPATH="\$RUNTIME_DIR"
71-
\$RUNTIME_DIR/bin/python3 "\$SOURCE_DIR/main.py" --setup
72-
EOF
73-
7463
mv dist GSInstaller.app
7564
codesign --deep --force --sign - "GSInstaller.app"
7665
ditto -c -k --keepParent "GSInstaller.app" GSInstallerMac.zip

src/buildtools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def build_mac(temp_path: str, datapath: str) -> None:
6767
"""RUNTIME_DIR="$DIR/../runtime\"""",
6868
"""SOURCE_DIR="$DIR/../desktop-service/src\"""",
6969
"""export PYTHONPATH="$RUNTIME_DIR\"""",
70-
"""$RUNTIME_DIR/bin/python3 "$SOURCE_DIR/main.py\"""",
70+
"""$RUNTIME_DIR/bin/python3 "$SOURCE_DIR/main.py\" "$@\"""",
7171
]
7272

7373
write(

src/installer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def install(installConfigs: dict[str, str]) -> None:
3434
makedirs(f"{datapath}/temp", exist_ok=True)
3535

3636
run([
37-
"/Applications/GraphScript.app/Contents/MacOS/setup.sh",
37+
"/Applications/GraphScript.app/Contents/MacOS/launcher.sh",
3838
"--setup",
3939
])
4040

0 commit comments

Comments
 (0)