flatpak bug fixes

DBChoco · May 19, 2022 · 5766311 · 5766311
1 parent 26e4593
commit 5766311
Show file tree

Hide file tree

Showing 4 changed files with 2,885 additions and 19 deletions.
diff --git a/flathub/io.github.dbchoco.Salawat.yml b/flathub/io.github.dbchoco.Salawat.yml
@@ -7,43 +7,35 @@ sdk-extensions:
 command: salawat
 separate-locales: false
 finish-args:
+  - --share=network
   - --share=ipc
   - --socket=x11
   - --socket=pulseaudio
-  - --share=network
   - --env=PATH=/app/jre/bin:/app/bin:/usr/bin
   - --env=JAVA_HOME=/app/jre
-
+  - --talk-name=org.freedesktop.Flatpak
 modules:
   - name: salawat
     buildsystem: simple
     build-options:
+      ##build-args: ##Uncomment when generating maven dependencies
+        ##- --share=network
       env:
         PATH: /app/bin:/usr/bin:/usr/lib/sdk/openjdk17/bin
         MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
         JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17
     build-commands:
+      - mvn clean package -P flatpak
       - install --directory --mode=0755 /app/salawat
-      - cp -r Salawat/* /app/salawat/
+      - cp -r target/Salawat/* /app/salawat/
       - install -Dm755 salawat.sh /app/bin/salawat
-      - install -Dm644 Salawat/icon.png /app/share/icons/hicolor/512x512/apps/$FLATPAK_ID.png
-      - install -Dm644 Salawat/Salawat.desktop /app/share/applications/${FLATPAK_ID}.desktop
+      - install -Dm644 target/Salawat/icon.png /app/share/icons/hicolor/512x512/apps/$FLATPAK_ID.png
+      - install -Dm644 target/Salawat/Salawat.desktop /app/share/applications/${FLATPAK_ID}.desktop
       - install -Dm644 io.github.dbchoco.Salawat.metainfo.xml /app/share/metainfo/$FLATPAK_ID.metainfo.xml
-
-      - mvn clean package -DpackagingPhase=none
-      - install -Dm755 -t "${FLATPAK_DEST}/bin" "es.estoes.wallpaperDownloader.sh"
-      - install -Dm644 -t "${FLATPAK_DEST}/share/es.estoes.wallpaperDownloader" "target/wallpaperdownloader.jar"
-      - install -Dm644 "deb/wallpaperdownloader.desktop" "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
-      - install -Dm644 "deb/wallpaperdownloader.svg" "${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/es.estoes.wallpaperDownloader.svg"
-      - install -Dm644 -t "${FLATPAK_DEST}/share/metainfo" "es.estoes.wallpaperDownloader.metainfo.xml"
-      - desktop-file-edit --remove-key=Version "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
-      - desktop-file-edit --set-key=Exec --set-value="${FLATPAK_DEST}/bin/es.estoes.wallpaperDownloader.sh" "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
-      - desktop-file-edit --set-icon=es.estoes.wallpaperDownloader "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
     sources:
       - type: archive
-        url: https://github.com/DBChoco/Salawat/releases/download/v1.0.0/Salawat-1.0.0-linux.tar.gz
-        sha256: 1fcc9201e9456e55a5cb40d53cad7aca4dd52784334ac1e912a75193ee9f09c9
-        dest: Salawat
+        url: https://github.com/DBChoco/Salawat/archive/refs/tags/v1.0.0.tar.gz
+        sha256: 47771a6a25f4690624dc7cb32f4c8c3424520a72738cc283df5ed71242169d42
       - type: file
         path: io.github.dbchoco.Salawat.metainfo.xml
       - type: file