Fix AppImage workflow

.github/workflows/release.yml

@@ -71,21 +71,13 @@ jobs:
           sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool
           sudo chmod +x /usr/local/bin/appimagetool
           sudo pip3 install appimage-builder
-      - name: Install legendary
-        run: |
-          pip install ./rare/legendary
-      - name: Prepare Build directory
-        run: |
-          mkdir build
-          cp AppImageBuilder.yml build/
-          cd build
       - name: Build Appimage
         run: |
           appimage-builder --skip-test
           mv Rare-*.AppImage Rare.AppImage
           mv Rare-*.AppImage.zsync Rare.AppImage.zsync
 
-      - name: Upload to GitHub
+      - name: Upload AppImage to GitHub
         uses: svenstaro/upload-release-action@2.2.1
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -93,7 +85,7 @@ jobs:
           asset_name: Rare-${{ github.event.release.tag_name }}.AppImage
           tag: ${{ github.ref }}
           overwrite: true
-      - name: Upload to GitHub
+      - name: Upload zsync file to GitHub
         uses: svenstaro/upload-release-action@2.2.1
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -47,14 +47,6 @@ jobs:
           sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool
           sudo chmod +x /usr/local/bin/appimagetool
           sudo pip3 install appimage-builder
-      - name: Install legendary
-        run: |
-          pip install ./rare/legendary
-      - name: Prepare Build directory
-        run: |
-          mkdir build
-          cp AppImageBuilder.yml build/
-          cd build
       - name: Build Appimage
         run: |
           appimage-builder --skip-test

AppImageBuilder.yml

@@ -7,13 +7,11 @@ script:
   # Make usr and icons dirs
   - mkdir -p AppDir/usr/src
   - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps/
-  - git clone https://github.com/Dummerle/Rare --recurse-submodules
+  - cp -r rare AppDir/usr/src/rare
-  - cp -r Rare/rare AppDir/usr/src/rare
-  - cp AppDir/usr/src/rare/__main__.py AppDir/usr/src/__main__.py
   - cp AppDir/usr/src/rare/resources/images/Rare.png AppDir/usr/share/icons/hicolor/256x256/apps/
   # Install application dependencies
   - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir pypresence qtawesome
-  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir ./Rare/rare/legendary
+  - python3 -m pip install --system --ignore-installed --prefix=/usr --root=AppDir ./rare/legendary
 
 AppDir:
   path: AppDir
@@ -23,7 +21,7 @@ AppDir:
     icon: Rare
     version: 1.7.0
     exec: usr/bin/python3
-    exec_args: $APPDIR/usr/src/__main__.py $@
+    exec_args: $APPDIR/usr/src/rare/__main__.py $@
   apt:
     arch: amd64
     allow_unauthenticated: true
@@ -41,10 +39,8 @@ AppDir:
       - sourceline: deb http://security.ubuntu.com/ubuntu groovy-security multiverse
     include:
       - python3
-      - python3-pkg-resources
       - python3-distutils
       - python3-pyqt5
-      - python3-pyqt5
       - python3-psutil
       - python3-requests
 
@@ -57,11 +53,6 @@ AppDir:
       # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
       PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages'
 
-
-  files:
-    include: [ ]
-    exclude: [ ]
-
   test:
     fedora:
       image: appimagecrafters/tests-env:fedora-30