Merge pull request #523 from wc7086/patch-1

fix install_ff_addons
This commit is contained in:
Luke Smith 2023-10-23 12:12:51 +00:00 committed by GitHub
commit 8c2f220c86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -225,14 +225,19 @@ installffaddons(){
IFS=' ' IFS=' '
sudo -u "$name" mkdir -p "$pdir/extensions/" sudo -u "$name" mkdir -p "$pdir/extensions/"
for addon in $addonlist; do for addon in $addonlist; do
if [ "$addon" = "ublock-origin" ]; then
addonurl="$(curl -sL https://api.github.com/repos/gorhill/uBlock/releases/latest | grep -E 'browser_download_url.*\.firefox\.xpi' | cut -d '"' -f 4)"
else
addonurl="$(curl --silent "https://addons.mozilla.org/en-US/firefox/addon/${addon}/" | grep -o 'https://addons.mozilla.org/firefox/downloads/file/[^"]*')" addonurl="$(curl --silent "https://addons.mozilla.org/en-US/firefox/addon/${addon}/" | grep -o 'https://addons.mozilla.org/firefox/downloads/file/[^"]*')"
fi
file="${addonurl##*/}" file="${addonurl##*/}"
sudo -u "$name" curl -LOs "$addonurl" > "$addontmp/$file" sudo -u "$name" curl -LOs "$addonurl" > "$addontmp/$file"
id="$(unzip -p "$file" manifest.json | grep "\"id\"")" id="$(unzip -p "$file" manifest.json | grep "\"id\"")"
id="${id%\"*}" id="${id%\"*}"
id="${id##*\"}" id="${id##*\"}"
sudo -u "$name" mv "$file" "$pdir/extensions/$id.xpi" mv "$file" "$pdir/extensions/$id.xpi"
done done
chown -R "$name:$name" "$pdir/extensions"
# Fix a Vim Vixen bug with dark mode not fixed on upstream: # Fix a Vim Vixen bug with dark mode not fixed on upstream:
sudo -u "$name" mkdir -p "$pdir/chrome" sudo -u "$name" mkdir -p "$pdir/chrome"
[ ! -f "$pdir/chrome/userContent.css" ] && sudo -u "$name" echo ".vimvixen-console-frame { color-scheme: light !important; } [ ! -f "$pdir/chrome/userContent.css" ] && sudo -u "$name" echo ".vimvixen-console-frame { color-scheme: light !important; }