summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarios8543 <marios8543@gmail.com>2023-10-26 23:25:00 +0300
committermarios8543 <marios8543@gmail.com>2023-10-26 23:25:00 +0300
commitffe9cd8afe9643c8d7b5e38c39fbe00847ed08e4 (patch)
tree82c3dacf8ad264a5e61f3f8e4e72bdd3b483c9df
parenta7669799bca3ff4089ab81fde924b2d2f787cf0f (diff)
downloaddecky-loader-ffe9cd8afe9643c8d7b5e38c39fbe00847ed08e4.tar.gz
decky-loader-ffe9cd8afe9643c8d7b5e38c39fbe00847ed08e4.zip
revert decky_plugin pyinstaller to previous version and fix sys path
-rw-r--r--.github/workflows/build-win.yml4
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--backend/src/main.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
index 118553ba..1ce47d4a 100644
--- a/.github/workflows/build-win.yml
+++ b/.github/workflows/build-win.yml
@@ -44,10 +44,10 @@ jobs:
run: pnpm run build
- name: Build Python Backend 🛠️
- run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin/*;/" --hidden-import=sqlite3 ./backend/main.py
+ run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
- name: Build Python Backend (noconsole) 🛠️
- run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin/*;/" --hidden-import=sqlite3 ./backend/main.py
+ run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
- name: Upload package artifact ⬆️
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2b1e29f..2d617db3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
run: pnpm run build
- name: Build Python Backend 🛠️
- run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/src/legacy:/src/legacy --add-data ./plugin/*:/ --hidden-import=sqlite3 ./backend/main.py
+ run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/src/legacy:/src/legacy --add-data ./plugin:/plugin --hidden-import=sqlite3 ./backend/main.py
- name: Upload package artifact ⬆️
if: ${{ !env.ACT }}
diff --git a/backend/src/main.py b/backend/src/main.py
index 83a4b997..ca6eef58 100644
--- a/backend/src/main.py
+++ b/backend/src/main.py
@@ -182,7 +182,7 @@ def main():
logger.warning(f"decky is running as an unprivileged user, this is not officially supported and may cause issues")
# Append the loader's plugin path to the recognized python paths
- sys.path.append(path.join(path.dirname(__file__), "plugin"))
+ sys.path.append(path.join(path.dirname(__file__), "..", "plugin"))
# Append the system and user python paths
sys.path.extend(get_system_pythonpaths())