Updated flatpak build and readme to point to the flathub page

nukeop · Jul 31, 2020 · f9effe4 · f9effe4
1 parent af05135
commit f9effe4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ Here's a list of packages for various managers, most of which are maintained by
 | Choco (Win)    | https://chocolatey.org/packages/nuclear/               | [JourneyOver](https://github.com/JourneyOver) |
 | Homebrew (Mac) | https://formulae.brew.sh/cask/nuclear                  | Homebrew                                      |
 | Snap           | https://snapcraft.io/nuclear                           | [nukeop](https://github.com/nukeop)           |
-|Flatpak         |(to be approved)                                       | [advaithm](https://github.com/advaithm)       |
+|Flatpak         |https://github.com/nukeop/nuclear                       | [advaithm](https://github.com/advaithm)       |
 
 big thanks to [ayyeve](https://github.com/ayyEve) for letting me (advaithm) use her server as a compile machine.
 ## Community translations

diff --git a/flatpak/org.js.nuclear.Nuclear.json b/flatpak/org.js.nuclear.Nuclear.json
@@ -2,23 +2,17 @@
     "app-id": "org.js.nuclear.Nuclear",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "19.08",
-    "branch": "19.08",
+    "branch": "stable",
     "sdk": "org.freedesktop.Sdk",
-    "base": "io.atom.electron.BaseApp",
-    "separate-locales": "false",
+    "separate-locales": false,
     "command": "run.sh",
     "finish-args": [
         "--share=network",
         "--share=ipc",
         "--socket=x11",
-        "--filesystem=host",
-	"--socket=pulseaudio"
+        "--filesystem=home",
+	 "--socket=pulseaudio"
     ],
-    "build-options" : {
-        "env": {
-            "NPM_CONFIG_LOGLEVEL": "info"
-        }
-    },
     "modules": [
         {
             "name": "nuclear",
@@ -31,21 +25,15 @@
                 },
                 {
                     "type":"file",
-                    "url":"https://raw.githubusercontent.com/advaithm/nuclear/master/flatpak/org.js.nuclear.Nuclear.metainfo.xml",
-                    "sha256":"17f2d8221f3cfec579457c05a4a56b85dcff2dd44bc86d5a2bca85e088af7c39",
-                    "dest-filename":"org.js.nuclear.Nuclear.metainfo.xml"
+                    "path": "org.js.nuclear.Nuclear.metainfo.xml"
                 },
                 {
                   "type":"file",
-                  "url":"https://raw.githubusercontent.com/advaithm/nuclear/master/flatpak/org.js.nuclear.Nuclear.desktop",
-                  "sha256":"61256cb50cbfa54d93b9c344f4795f42f7dc73cd195be17915403d0ac281ce88",
-                  "dest-filename":"org.js.nuclear.Nuclear.desktop"
+                  "path": "org.js.nuclear.Nuclear.desktop"
                 },
                 {
                     "type":"file",
-                    "url":"https://github.com/nukeop/nuclear/raw/master/build/512.png",
-                    "sha1":"f7568bc736304246d054faa7cf528c3e8bc0a6d5",
-                    "dest-filename":"org.js.nuclear.Nuclear.png"
+                    "path":"org.js.nuclear.Nuclear.png"
                 },
                 {
                     "type": "script",
@@ -55,16 +43,12 @@
 
             ],
         "build-commands": [
-                "mkdir -p /app/main /app/bin",
-                "cp -ra  * /app/main/",
-                "mkdir -p /app/share/metainfo/",
-                "mkdir -p /app/share/icons/hicolor/512x512/apps/",
-                "mkdir -p /app/share/applications/",
-                "cp -r org.js.nuclear.Nuclear.png /app/share/icons/hicolor/512x512/apps/",
-                "ls /app/share/icons/hicolor/512x512/apps/",
-                "cp -r org.js.nuclear.Nuclear.metainfo.xml /app/share/metainfo/",
-                "cp -r org.js.nuclear.Nuclear.desktop /app/share/applications/",
-                "install run.sh /app/bin/"
+		"mkdir -p /app/main/",
+                "cp -r  * /app/main/", 
+                "install -D org.js.nuclear.Nuclear.png --target-directory=/app/share/icons/hicolor/512x512/apps/",
+                "install -D org.js.nuclear.Nuclear.metainfo.xml --target-directory=/app/share/metainfo/",
+                "install -D org.js.nuclear.Nuclear.desktop --target-directory=/app/share/applications/",
+                "install -D run.sh --target-directory=/app/bin/"
             ]
         }
     ]

diff --git a/flatpak/org.js.nuclear.Nuclear.metainfo.xml b/flatpak/org.js.nuclear.Nuclear.metainfo.xml
@@ -14,19 +14,19 @@
 
     <p>Features</p>
     <ul>
-        <li>- Searching for and playing music from YouTube (including integration with playlists), Jamendo, and SoundCloud</li>
-        <li>- Searching for albums (powered by Last.fm and Discogs), album view, automatic song lookup based on artist and track name (in progress, can be dodgy sometimes)</li>
-        <li>- Song queue, which can be exported as a playlist</li>
-        <li>- Loading saved playlists (stored in json files)</li>
-        <li>- Scrobbling to last.fm (along with updating the 'now playing' status)</li>
-        <li>- Newest releases with reviews - tracks and albums</li>
-        <li>- Browsing by genre</li>
-        <li>- Radio mode (automatically queue similar tracks)</li>
-        <li>- Unlimited downloads (powered by youtube)</li>
-        <li>- Realtime lyrics</li>
-        <li>- Browsing by popularity</li>
-        <li>- List of favorite tracks</li>
-        <li>- Listening from local library</li>
+        <li> Searching for and playing music from YouTube (including integration with playlists), Jamendo, and SoundCloud</li>
+        <li> Searching for albums (powered by Last.fm and Discogs), album view, automatic song lookup based on artist and track name (in progress, can be dodgy sometimes)</li>
+        <li> Song queue, which can be exported as a playlist</li>
+        <li> Loading saved playlists (stored in json files)</li>
+        <li> Scrobbling to last.fm (along with updating the 'now playing' status)</li>
+        <li> Newest releases with reviews - tracks and albums</li>
+        <li> Browsing by genre</li>
+        <li> Radio mode (automatically queue similar tracks)</li>
+        <li> Unlimited downloads (powered by youtube)</li>
+        <li> Realtime lyrics</li>
+        <li> Browsing by popularity</li>
+        <li> List of favorite tracks</li>
+        <li> Listening from local library</li>
     </ul>
     </description> 
     <launchable type="desktop-id">org.js.nuclear.Nuclear.desktop</launchable>
@@ -62,9 +62,6 @@
     </screenshots>
     <url type="homepage">https://nuclear.js.org</url>
     <project_group>Nuclear</project_group>
-    <provides>
-        <binary>Nuclear</binary>
-    </provides>
     <releases>
         <release version="0.6.3" date="2020-02-04">
         <description>

diff --git a/flatpak/org.js.nuclear.Nuclear.png b/flatpak/org.js.nuclear.Nuclear.png