X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=filesystem%2Fusr%2Flocal%2Fbin%2Fabrowser;h=96c969a4c149ca95aadd09383fa56df94e523534;hb=eef2ed83fa84b3ac19533dfe0239cef4c2223143;hp=365911c54c77174c6f39263723a18dd431c75305;hpb=75e62ecbdabb055ef8d556e2e3aad7117557eb92;p=distro-setup diff --git a/filesystem/usr/local/bin/abrowser b/filesystem/usr/local/bin/abrowser index 365911c..96c969a 100755 --- a/filesystem/usr/local/bin/abrowser +++ b/filesystem/usr/local/bin/abrowser @@ -1,12 +1,33 @@ #!/bin/bash +# I, Ian Kelling, follow the GNU license recommendations at +# https://www.gnu.org/licenses/license-recommendations.en.html. They +# recommend that small programs, < 300 lines, be licensed under the +# Apache License 2.0. This file contains or is part of one or more small +# programs. If a small program grows beyond 300 lines, I plan to switch +# its license to GPL. + +# Copyright 2024 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# note this is duplicated in i3-abrowser + +if ! test "$BASH_VERSION"; then echo "error: shell is not bash" >&2; exit 1; fi +shopt -s inherit_errexit 2>/dev/null ||: # ignore fail in bash < 4.4 +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" exit status: $?, PIPESTATUS: ${PIPESTATUS[*]}" >&2' ERR + -# https://stackoverflow.com/a/2108540 -tmp=:$PATH: -del=/usr/local/bin -tmp=${tmp//:$del:/:} -tmp=${tmp%:} -tmp=${tmp#:} -PATH=$tmp # -allow-downgrade good enough? #rm -f {/p/c/firefox-main-profile,/p/c/firefox-main-profile,/p/c/firefox-vpn2-profile,/mnt/z/firefox-vpn-profile}/compatibility.ini @@ -16,9 +37,21 @@ PATH=$tmp # causes a new browser window to open, even if normally it would open a # new tab + + +# remove local/bin from path +# https://stackoverflow.com/a/2108540 +tmp=:$PATH: +del=/usr/local/bin +tmp=${tmp//:$del:/:} +tmp=${tmp%:} +tmp=${tmp#:} +PATH=$tmp # prefer abrowser if type -P abrowser &>/dev/null; then - abrowser "$@" + b=abrowser else - firefox "$@" + b=firefox fi + +$b "$@"