diff --git a/bash/usr-local-bin/firefox b/bash/usr-local-bin/firefox index 04fef6a..c4efb15 100755 --- a/bash/usr-local-bin/firefox +++ b/bash/usr-local-bin/firefox @@ -1,14 +1,11 @@ #!/usr/bin/env bash -# I always want to see the profile manager, whether it's my first run or -# not and I probably have to micromanage wayland enabling everywhere. - -# I cannot use the Flatpak as it doesn't support smartcards or /etc/policies -# https://github.com/flatpak/flatpak/issues/4723 https://github.com/flatpak/flatpak/issues/4525 +# Wrapper for Firefox finding it with my flags no matter where it's installed +# to, mainly for use with a desktop entry. set -x export MOZ_ENABLE_WAYLAND=1 -FlagsForFirefox="--allow-downgrade --ProfileManager $@" +FlagsForFirefox="--allow-downgrade $@" # Firefox (stable, beta) and signatures: https://releases.mozilla.org/pub/firefox/releases/ # Developer edition (and signatures): https://releases.mozilla.org/pub/devedition/releases/ diff --git a/bash/usr-local-bin/firefox-npm b/bash/usr-local-bin/firefox-npm deleted file mode 100755 index e88281e..0000000 --- a/bash/usr-local-bin/firefox-npm +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# This is variant of the firefox wrapper script, except without profile -# manager for use with desktop entry that just quickly launches the main -# profile. - -set -x -export MOZ_ENABLE_WAYLAND=1 -FlagsForFirefox="--allow-downgrade $@" - -# Firefox (stable, beta) and signatures: https://releases.mozilla.org/pub/firefox/releases/ -# Developer edition (and signatures): https://releases.mozilla.org/pub/devedition/releases/ -if [ -f ~/.local/firefox/firefox ]; then - ~/.local/firefox/firefox $FlagsForFirefox -# Fallback to global installation -elif [ -f /usr/bin/firefox ]; then - /usr/bin/firefox $FlagsForFirefox -# Fallback to global installation -elif [ -f /usr/bin/firefox-esr ]; then - /usr/bin/firefox-esr $FlagsForFirefox -# Fallback to Snap which apparently follows /etc/policies.json -elif [ -f /snap/bin/firefox ]; then - snap run firefox $FlagsForFirefox -# Fallback to flatpak, don't care if it doesn't exist -else - flatpak run org.mozilla.firefox $FlagsForFirefox -fi - -set +x