diff --git a/com.zen.browser.flatpak.yml b/com.zen.browser.flatpak.yml deleted file mode 100644 index c653477..0000000 --- a/com.zen.browser.flatpak.yml +++ /dev/null @@ -1,66 +0,0 @@ -app-id: com.zen.browser -runtime: org.freedesktop.Platform -runtime-version: '22.08' -sdk: org.freedesktop.Sdk -base: org.mozilla.firefox.BaseApp -base-version: '22.08' -command: launch-script.sh -finish-args: - - --share=ipc - - --share=network - - --env=GTK_PATH=/app/lib/gtkmodules - - --socket=pulseaudio - - --socket=wayland - - --socket=x11 - - --socket=pcsc - - --socket=cups - - --persist=.zen - - --filesystem=xdg-download:rw - - --device=all - - --talk-name=org.freedesktop.FileManager1 - - --system-talk-name=org.freedesktop.NetworkManager - - --talk-name=org.a11y.Bus - - --talk-name=org.gnome.SessionManager - - --talk-name=org.freedesktop.ScreenSaver - - --talk-name=org.freedesktop.Notifications - - --own-name=com.zen.browser.* -modules: - - name: zen_browser - buildsystem: simple - build-commands: - - tar -xvf zen.linux.tar.bz2 - - mv zen/ bin/ - - - install -d /app/bin - - install -d /app/bin/distribution - - install -d /app/share/icons - - install -d /app/share/metainfo - - install -d /app/share/applications - - - cp -r bin/* /app/bin - - cp -r icons/* /app/share/icons - - cp launch-script.sh /app/bin/launch-script.sh - - cp -r policies.json /app/bin/distribution/policies.json - - - cp com.zen.browser.metainfo.xml /app/share/metainfo/com.zen.browser.metainfo.xml - - cp com.zen.browser.desktop /app/share/applications/com.zen.browser.desktop - - - chmod +x /app/bin/launch-script.sh - sources: - - type: file - path: ./zen.linux.tar.bz2 - - - type: file - path: ./policies.json - - - type: file - path: ./launch-script.sh - - - type: file - path: ./com.zen.browser.metainfo.xml - - type: file - path: ./com.zen.browser.desktop - - - type: dir - path: ./icons/ - dest: icons \ No newline at end of file diff --git a/flathub.json b/flathub.json new file mode 100644 index 0000000..45dd01d --- /dev/null +++ b/flathub.json @@ -0,0 +1,3 @@ +{ + "skip-arches": ["aarch64"] +} \ No newline at end of file diff --git a/icons/appdir/128x128/com.zen.browser.png b/icons/appdir/128x128/com.zen.browser.png deleted file mode 100644 index 45a5ded..0000000 Binary files a/icons/appdir/128x128/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/16x16/com.zen.browser.png b/icons/appdir/16x16/com.zen.browser.png deleted file mode 100644 index e0d7311..0000000 Binary files a/icons/appdir/16x16/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/22x22/com.zen.browser.png b/icons/appdir/22x22/com.zen.browser.png deleted file mode 100644 index 412c10e..0000000 Binary files a/icons/appdir/22x22/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/24x24/com.zen.browser.png b/icons/appdir/24x24/com.zen.browser.png deleted file mode 100644 index 9eef2af..0000000 Binary files a/icons/appdir/24x24/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/32x32/com.zen.browser.png b/icons/appdir/32x32/com.zen.browser.png deleted file mode 100644 index de5b390..0000000 Binary files a/icons/appdir/32x32/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/48x48/com.zen.browser.png b/icons/appdir/48x48/com.zen.browser.png deleted file mode 100644 index aa409ea..0000000 Binary files a/icons/appdir/48x48/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/64x64/com.zen.browser.png b/icons/appdir/64x64/com.zen.browser.png deleted file mode 100644 index bcb4aae..0000000 Binary files a/icons/appdir/64x64/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/128x128/apps/com.zen.browser.png b/icons/hicolor/128x128/apps/com.zen.browser.png deleted file mode 100644 index 45a5ded..0000000 Binary files a/icons/hicolor/128x128/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/16x16/apps/com.zen.browser.png b/icons/hicolor/16x16/apps/com.zen.browser.png deleted file mode 100644 index e0d7311..0000000 Binary files a/icons/hicolor/16x16/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/22x22/apps/com.zen.browser.png b/icons/hicolor/22x22/apps/com.zen.browser.png deleted file mode 100644 index 412c10e..0000000 Binary files a/icons/hicolor/22x22/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/24x24/apps/com.zen.browser.png b/icons/hicolor/24x24/apps/com.zen.browser.png deleted file mode 100644 index 9eef2af..0000000 Binary files a/icons/hicolor/24x24/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/256x256/apps/com.zen.browser.png b/icons/hicolor/256x256/apps/com.zen.browser.png deleted file mode 100644 index cc199fe..0000000 Binary files a/icons/hicolor/256x256/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/32x32/apps/com.zen.browser.png b/icons/hicolor/32x32/apps/com.zen.browser.png deleted file mode 100644 index de5b390..0000000 Binary files a/icons/hicolor/32x32/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/48x48/apps/com.zen.browser.png b/icons/hicolor/48x48/apps/com.zen.browser.png deleted file mode 100644 index aa409ea..0000000 Binary files a/icons/hicolor/48x48/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/hicolor/64x64/apps/com.zen.browser.png b/icons/hicolor/64x64/apps/com.zen.browser.png deleted file mode 100644 index bcb4aae..0000000 Binary files a/icons/hicolor/64x64/apps/com.zen.browser.png and /dev/null differ diff --git a/icons/appdir/256x256/com.zen.browser.png b/icons/io.github.zen_browser.desktop.png similarity index 100% rename from icons/appdir/256x256/com.zen.browser.png rename to icons/io.github.zen_browser.desktop.png diff --git a/com.zen.browser.desktop b/io.github.zen_browser.desktop.desktop similarity index 72% rename from com.zen.browser.desktop rename to io.github.zen_browser.desktop.desktop index 87c8c0f..455ce6b 100644 --- a/com.zen.browser.desktop +++ b/io.github.zen_browser.desktop.desktop @@ -6,6 +6,6 @@ Name=Zen Browser Comment=Zen Browser. Your browser, your way. Categories=Network;WebBrowser; -Icon=com.zen.browser -Exec=/app/bin/launch-script.sh +Icon=io.github.zen_browser.desktop +Exec=launch-script.sh Terminal=false \ No newline at end of file diff --git a/com.zen.browser.metainfo.xml b/io.github.zen_browser.desktop.xml similarity index 50% rename from com.zen.browser.metainfo.xml rename to io.github.zen_browser.desktop.xml index e4ab26a..29470ca 100644 --- a/com.zen.browser.metainfo.xml +++ b/io.github.zen_browser.desktop.xml @@ -1,9 +1,14 @@ - com.zen.browser + io.github.zen_browser.desktop + https://get-zen.vercel.app + + + Zen Team + Zen Browser - Zen Browser. youur browser, your way! + Zen Browser. your browser, your way! MIT MPL-2.0 @@ -21,7 +26,17 @@ - com.zen.browser.desktop + + + https://get-zen.vercel.app/release-notes/1.0.0-a.7 + + + + + io.github.zen_browser.desktop + + + io.github.zen_browser.desktop.desktop https://get-zen.vercel.app/browser-dark.png @@ -30,4 +45,9 @@ https://get-zen.vercel.app/browser-light.png + + + #d9d9d9 + #f5f5f5 + \ No newline at end of file diff --git a/io.github.zen_browser.desktop.yml b/io.github.zen_browser.desktop.yml new file mode 100644 index 0000000..2c7f5e7 --- /dev/null +++ b/io.github.zen_browser.desktop.yml @@ -0,0 +1,57 @@ +app-id: io.github.zen_browser.desktop +runtime: org.freedesktop.Platform +runtime-version: '23.08' +sdk: org.freedesktop.Sdk +base: org.mozilla.firefox.BaseApp +base-version: '23.08' +command: launch-script.sh +finish-args: + - --share=ipc + - --share=network + - --socket=pulseaudio + - --socket=wayland + - --socket=fallback-x11 + - --socket=pcsc + - --socket=cups + - --persist=.zen + - --filesystem=xdg-download:rw + - --device=all + - --talk-name=org.freedesktop.FileManager1 + - --system-talk-name=org.freedesktop.NetworkManager + - --talk-name=org.a11y.Bus +modules: + - name: zen_browser + buildsystem: simple + build-commands: + - mv zen/* /app/ + + - install -d /app/share/icons + + - cp -r icons/* /app/share/icons + - install -Dm0755 launch-script.sh ${FLATPAK_DEST}/bin/launch-script.sh + - install -Dm0644 policies.json /app/bin/distribution/policies.json + + - install -Dm0644 io.github.zen_browser.desktop.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml + - install -Dm0644 io.github.zen_browser.desktop.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop + + sources: + - type: archive + url: https://github.com/zen-browser/desktop/releases/download/1.0.0-a.7/zen.linux.tar.bz2 + + - type: file + path: policies.json + + - type: file + path: launch-script.sh + + - type: file + path: io.github.zen_browser.desktop.metainfo.xml + - type: file + path: io.github.zen_browser.desktop.desktop + + - type: file + path: ./icons/io.github.zen_browser.desktop.png + dest: icons + + - type: file + path: flathub.json \ No newline at end of file diff --git a/launch-script.sh b/launch-script.sh index f5c5062..c50deec 100644 --- a/launch-script.sh +++ b/launch-script.sh @@ -1,19 +1,4 @@ #!/bin/bash export TMPDIR=$XDG_CACHE_HOME/tmp -MOZ_LAUNCHER="$MOZ_DIST_BIN/launch-script.sh" -## -## Enable Wayland backend? -## -if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then - if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then - export MOZ_ENABLE_WAYLAND=1 - fi -## Enable Wayland on KDE/Sway -## - if [ "$XDG_SESSION_TYPE" == "wayland" ]; then - export MOZ_ENABLE_WAYLAND=1 - fi -fi - -exec /app/bin/zen "$@" \ No newline at end of file +exec /app/zen/zen "$@" \ No newline at end of file diff --git a/update.sh b/update.sh deleted file mode 100644 index 7c48287..0000000 --- a/update.sh +++ /dev/null @@ -1,36 +0,0 @@ - -git clone https://github.com/zen-browser/desktop.git browser - -icon_id="com.zen.browser" -icon_repo_path="browser/configs/branding" - -function icon { - local size="$1x$1" - local brand=$2 - - echo "Icon: $size" - - # Initialise dirs - mkdir -p "icons/$brand/hicolor/$size/apps/" - mkdir -p "icons/$brand/appdir/$size/" - # Download files to the correct dir - cp "$icon_repo_path/$brand/logo$1.png" "icons/$brand/hicolor/$size/apps/$icon_id.png" - cp "$icon_repo_path/$brand/logo$1.png" "icons/$brand/appdir/$size/$icon_id.png" -} - -function branding_icon { - local brand=$1 - - icon 16 $brand - icon 22 $brand - icon 24 $brand - icon 32 $brand - icon 48 $brand - icon 64 $brand - icon 128 $brand - icon 256 $brand -} - -branding_icon "alpha" - -rm -rf browser \ No newline at end of file