diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 90 | ||||
-rw-r--r-- | mercury-browser.install | 8 | ||||
-rw-r--r-- | mercury-browser.sh | 19 |
4 files changed, 71 insertions, 50 deletions
@@ -1,7 +1,7 @@ pkgbase = mercury-browser-bin pkgdesc = Compiler optimized, private Firefox fork pkgver = 121.0.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Alex313031/Mercury install = mercury-browser.install arch = x86_64 @@ -16,7 +16,7 @@ pkgbase = mercury-browser-bin source = mercury-browser_121.0.1_amd64.deb::https://github.com/Alex313031/Mercury/releases/download/v.121.0.1/mercury-browser_121.0.1_amd64.deb source = mercury-browser.sh sha256sums = SKIP - sha256sums = 7565aa160be433bcc030c2fc14627ce12c91fbb953d8ba8af8185ccd356022f5 + sha256sums = c542235c03f0ca3cfed6cebb234d7637cd920dcfbba47d2a31c0814f525788ae pkgname = mercury-browser-bin depends = alsa-lib @@ -14,7 +14,7 @@ fi _pkgname="mercury-browser" pkgname="$_pkgname${_pkgtype:-}" pkgver=121.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Compiler optimized, private Firefox fork" url="https://github.com/Alex313031/Mercury" license=('MPL-2.0') @@ -44,7 +44,7 @@ _main_package() { ) sha256sums=( 'SKIP' - '7565aa160be433bcc030c2fc14627ce12c91fbb953d8ba8af8185ccd356022f5' + 'c542235c03f0ca3cfed6cebb234d7637cd920dcfbba47d2a31c0814f525788ae' ) } @@ -54,6 +54,40 @@ pkgver() { "${_pkgver:?}" } +prepare() { + # desktop + install -Dvm644 /dev/stdin "$_pkgname.desktop" <<END +[Desktop Entry] +Version=1.0 +Name=Mercury +Comment=Browse the World Wide Web +GenericName=Web Browser +Keywords=Internet;WWW;Browser;Web;Explorer;Mercury +Exec=$_pkgname %u +StartupWMClass=mercury-default +Terminal=false +X-MultipleArgs=true +Type=Application +Icon=$_pkgname +Categories=GNOME;GTK;Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; +StartupNotify=true +Actions=NewWindow;NewPrivateWindow;TempUserDir; + +[Desktop Action NewWindow] +Name=New Window +Exec=$_pkgname -new-window + +[Desktop Action NewPrivateWindow] +Name=New Private Window +Exec=$_pkgname -private-window + +[Desktop Action TempUserDir] +Name=Open With Temporary User Profile +Exec=$_pkgname --temp-profile +END +} + package() { provides=("$_pkgname=${pkgver%%.r*}") conflicts=("$_pkgname") @@ -99,15 +133,28 @@ package() { fi # script + \rm -rf "$pkgdir/usr/bin/mercury-browser" install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" - # fix permissions - chmod -R u+rwX,go+rX,go-w "$pkgdir/" + # icon + install -Dm644 "$pkgdir/opt/$_pkgname/browser/chrome/icons/default/default128.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" + + # .desktop + \rm -rf "$pkgdir/usr/share/applications/mercury-browser.desktop" + install -Dm644 "$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop" + + # symlink duplicate file + ln -sf "/usr/bin/$_pkgname" "$pkgdir/opt/$_pkgname/mercury-bin" # remove unnecessary folders \rm -rf "${pkgdir:?}/usr/lib/" \rm -rf "${pkgdir:?}/usr/share/doc/" + \rm -rf "${pkgdir:?}/usr/share/icons" \rm -rf "${pkgdir:?}/usr/share/lintian/" + \rm -rf "${pkgdir:?}/usr/share/man/" + + # fix permissions + chmod -R u+rwX,go+rX,go-w "$pkgdir/" } _package_deb() { @@ -130,41 +177,6 @@ _package_zip() { # extract archive install -dm755 "$pkgdir/opt/$_pkgname" bsdtar --strip-components="$_depth" -C "$pkgdir/opt/$_pkgname/" -xf "$_dl_filename" '*/mercury/*' - - # icon - install -Dm644 "$pkgdir/opt/$_pkgname/browser/chrome/icons/default/default128.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" - - # desktop - install -Dvm644 /dev/stdin "$pkgdir/usr/share/applications/mercury-browser.desktop" <<END -[Desktop Entry] -Version=1.0 -Name=Mercury -Comment=Browse the World Wide Web -GenericName=Web Browser -Keywords=Internet;WWW;Browser;Web;Explorer;Mercury -Exec=$_pkgname %u -StartupWMClass=mercury-default -Terminal=false -X-MultipleArgs=true -Type=Application -Icon=$_pkgname -Categories=GNOME;GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; -StartupNotify=true -Actions=NewWindow;NewPrivateWindow;TempUserDir; - -[Desktop Action NewWindow] -Name=New Window -Exec=$_pkgname -new-window - -[Desktop Action NewPrivateWindow] -Name=New Private Window -Exec=$_pkgname -private-window - -[Desktop Action TempUserDir] -Name=Open With Temporary User Profile -Exec=$_pkgname --temp-profile -END } # update version diff --git a/mercury-browser.install b/mercury-browser.install index 1c810c1625a1..10e65bad61e0 100644 --- a/mercury-browser.install +++ b/mercury-browser.install @@ -24,9 +24,13 @@ WHITE="${BOLD}$(tput setaf 7)" post_install() { if /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v3.*supported.*$' ; then - note1 "Enjoy the fastest Firefox fork on Earth: mercury-browser" + note1 "Custom flags may be put directly in: ~/.config/mercury-flags.conf" + note2 "The launcher is called: 'mercury-browser'" + elif /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v2.*supported.*$' ; then + note1 "Your processor supports x86-64-v2, but not x86-64-v3." + note2 "You may want to install mercury-browser-sse3-bin instead." else - note1 "Your processor does not support x86-64-v3." + note1 "Your processor does not support x86-64-v2 or x86-64-v3." note2 "mercury-browser may not work on your computer." fi } diff --git a/mercury-browser.sh b/mercury-browser.sh index eac094bad6c7..1b8c1f36ef97 100644 --- a/mercury-browser.sh +++ b/mercury-browser.sh @@ -2,18 +2,23 @@ # check microprocessor architecture level if /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v3.*supported.*$' ; then - _message+=$'Enjoy the fastest Firefox fork on Earth.' + _message='' + _message+=$'The fastest Firefox fork on Earth.' +elif /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v2.*supported.*$' ; then + _message='' + _message+=$'Your processor supports x86-64-v2, but not x86-64-v3.\n' + _message+=$'You may want to use mercury-browser-sse3-bin.' else _message='' - _message+=$'Your processor does not support x86-64-v3.\n' + _message+=$'Your processor does not support x86-64-v2 or x86-64-v3.\n' _message+=$'mercury-browser may not work on your computer.' fi -XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config} - # Allow users to override command-line options -if [[ -f $XDG_CONFIG_HOME/mercury-flags.conf ]]; then - MERCURY_USER_FLAGS="$(cat $XDG_CONFIG_HOME/mercury-flags.conf)" +XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config} +_FLAGFILE="$XDG_CONFIG_HOME/mercury-flags.conf" +if [[ -f "$_FLAGFILE" ]]; then + _USER_FLAGS=$(cat "$_FLAGFILE") fi # display processor support message @@ -24,4 +29,4 @@ else fi # Launch -exec /opt/mercury-browser/mercury $MERCURY_USER_FLAGS "$@" +exec /opt/mercury-browser/mercury $_USER_FLAGS "$@" |