diff --git a/README.md b/README.md index 06ce13a302..5f41449c5a 100644 --- 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 index 5f3f870d7e..947df4443d 100644 --- 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 index a4cc1abfd0..2764b685d1 100644 --- a/flatpak/org.js.nuclear.Nuclear.metainfo.xml +++ b/flatpak/org.js.nuclear.Nuclear.metainfo.xml @@ -14,19 +14,19 @@

Features

org.js.nuclear.Nuclear.desktop @@ -62,9 +62,6 @@ https://nuclear.js.org Nuclear - - Nuclear - diff --git a/flatpak/org.js.nuclear.Nuclear.png b/flatpak/org.js.nuclear.Nuclear.png new file mode 100644 index 0000000000..3f9867aa40 Binary files /dev/null and b/flatpak/org.js.nuclear.Nuclear.png differ