From dda397fea39f7d486350bd537b9ff406edd24348 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sun, 3 Dec 2023 17:03:31 +0600 Subject: [PATCH] Use AppDir variable instead of BuildDir --- dist_assets/linux/AppImageBuilder.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dist_assets/linux/AppImageBuilder.yml b/dist_assets/linux/AppImageBuilder.yml index af0a58b03..2a043c445 100644 --- a/dist_assets/linux/AppImageBuilder.yml +++ b/dist_assets/linux/AppImageBuilder.yml @@ -22,23 +22,22 @@ AppDir: exclude: [] after_bundle: - - mkdir -p $BUILD_DIR/AppDir # Detect location of python using venv config and copy it over to our app directory - - cp -r `~/venv3.11/bin/python scripts/getConfigVal.py ~/venv3.11/pyvenv.cfg base-prefix`/* $BUILD_DIR/AppDir + - cp -r `~/venv3.11/bin/python scripts/getConfigVal.py ~/venv3.11/pyvenv.cfg base-prefix`/* $AppDir # Install python dependencies - - $BUILD_DIR/AppDir/bin/python3 -s -m pip install -U pip setuptools wheel - - $BUILD_DIR/AppDir/bin/python3 -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt + - $AppDir/bin/python3 -s -m pip install -U pip setuptools wheel + - $AppDir/bin/python3 -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt # Compile app data - find locale/ -type f -name "*.po" -exec msgen "{}" -o "{}" \; - - $BUILD_DIR/AppDir/bin/python3 scripts/compile_lang.py - - $BUILD_DIR/AppDir/bin/python3 scripts/dump_crowdin_progress.py - - $BUILD_DIR/AppDir/bin/python3 db_update.py + - $AppDir/bin/python3 scripts/compile_lang.py + - $AppDir/bin/python3 scripts/dump_crowdin_progress.py + - $AppDir/bin/python3 db_update.py # Calculate app version - - export PYFA_VERSION="$($BUILD_DIR/AppDir/bin/python3 scripts/dump_version.py)" + - export PYFA_VERSION="$($AppDir/bin/python3 scripts/dump_version.py)" # Copy app and clean it up - - mkdir -p $BUILD_DIR/AppDir/usr/src - - cp -r eos graphs gui imgs locale service utils eve.db config.py pyfa.py db_update.py README.md LICENSE version.yml $BUILD_DIR/AppDir/usr/src - - find $BUILD_DIR/AppDir/usr/src | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf + - mkdir -p $AppDir/usr/src + - cp -r eos graphs gui imgs locale service utils eve.db config.py pyfa.py db_update.py README.md LICENSE version.yml $AppDir/usr/src + - find $AppDir/usr/src | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf AppImage: sign-key: None