Update 2 files
- /home/.chezmoiscripts/universal/run_onchange_after_40-firefox.sh.tmpl - /home/.chezmoiscripts/universal/run_onchange_before_14-warp.sh.tmpl
This commit is contained in:
parent
546f157cae
commit
51ade9064a
2 changed files with 9 additions and 3 deletions
|
@ -250,7 +250,7 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
|
||||||
cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/firefox/user.js" "$SETTINGS_DIR/profile.plugins"
|
cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/firefox/user.js" "$SETTINGS_DIR/profile.plugins"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt") (ne .firefoxPrivateProfile false)) }}
|
{{- if stat (joinPath .host.home ".config" "age" "chezmoi.txt") }}
|
||||||
### Private hosted profile
|
### Private hosted profile
|
||||||
if [ ! -d "$SETTINGS_DIR/profile.private" ]; then
|
if [ ! -d "$SETTINGS_DIR/profile.private" ]; then
|
||||||
logg info 'Downloading the encrypted Firefox private profile'
|
logg info 'Downloading the encrypted Firefox private profile'
|
||||||
|
|
|
@ -65,9 +65,15 @@ if [[ ! "$(test -d /proc && grep Microsoft /proc/version > /dev/null)" ]]; then
|
||||||
sudo apt-get update && sudo apt-get install -y cloudflare-warp
|
sudo apt-get update && sudo apt-get install -y cloudflare-warp
|
||||||
elif command -v dnf > /dev/null && command -v rpm > /dev/null; then
|
elif command -v dnf > /dev/null && command -v rpm > /dev/null; then
|
||||||
### This is made for CentOS 8 and works on Fedora 36 (hopefully 36+ as well) with `nss-tools` as a dependency
|
### This is made for CentOS 8 and works on Fedora 36 (hopefully 36+ as well) with `nss-tools` as a dependency
|
||||||
sudo dnf instal -y nss-tools
|
sudo dnf instal -y nss-tools || NSS_TOOL_EXIT=$?
|
||||||
|
if [ -n "$NSS_TOOL_EXIT" ]; then
|
||||||
|
logg warn 'Unable to install `nss-tools` which was a requirement on Fedora 36 and assumed to be one on other systems as well.'
|
||||||
|
fi
|
||||||
### According to the download site, this is the only version available for RedHat-based systems
|
### According to the download site, this is the only version available for RedHat-based systems
|
||||||
sudo rpm -ivh https://pkg.cloudflareclient.com/cloudflare-release-el8.rpm
|
sudo rpm -ivh https://pkg.cloudflareclient.com/cloudflare-release-el8.rpm || RPM_EXIT_CODE=$?
|
||||||
|
if [ -n "$RPM_EXIT_CODE" ]; then
|
||||||
|
logg error 'Unable to install CloudFlare WARP using RedHat 8 RPM package'
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue