diff --git a/.appveyor.yml b/.appveyor.yml index 4d749aa5c..4acc8bded 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -33,11 +33,14 @@ for: - sh: rm AppDir/python*.desktop - sh: rm AppDir/usr/share/applications/*.desktop - sh: rm AppDir/usr/share/metainfo/*.appdata.xml + - sh: unlink AppDir/AppRun - sh: mkdir -p $DEPLOY_DIR # run install pyfa packages and any other requirements - sh: AppDir/usr/bin/python -s -m pip install -U pip setuptools==41.6.0 wheel pathlib2 - sh: AppDir/usr/bin/python -s -m pip install -r ../requirements.txt + # Speedup, but causes runtime incompatiblities + #- sh: AppDir/usr/bin/python -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 -r ../requirements.txt # Run scripts to prep pyfa data and build database - sh: cd ../ @@ -53,9 +56,10 @@ for: # Copy static AppImage files - sh: cd dist_assets/linux + - sh: chmod +x AppRun - sh: cp AppRun pyfa.desktop ../../build/AppDir/ - sh: cp pyfa.desktop ../../build/AppDir/usr/share/applications/ - - sh: cp org.pyfa.pyfa.appdata.xml ../../build/AppDir/usr/share/metainfo/ + - sh: cp pyfa.appdata.xml ../../build/AppDir/usr/share/metainfo/ - sh: chmod +x pyfa && cp pyfa ../../build/AppDir/usr/bin - sh: cd ../../ @@ -211,4 +215,4 @@ for: force_update: false # deploy on tag push only on: - APPVEYOR_REPO_TAG: true \ No newline at end of file + APPVEYOR_REPO_TAG: true diff --git a/dist_assets/linux/AppRun b/dist_assets/linux/AppRun old mode 100644 new mode 100755 diff --git a/dist_assets/linux/org.pyfa.pyfa.appdata.xml b/dist_assets/linux/pyfa.appdata.xml similarity index 100% rename from dist_assets/linux/org.pyfa.pyfa.appdata.xml rename to dist_assets/linux/pyfa.appdata.xml