modified static/thesiah.sh

1 files changed, 11 insertions, 24 deletions

diff --git a/static/thesiah.sh b/static/thesiah.sh
index 4e18142..d4ce534 100755
--- a/static/thesiah.sh
+++ b/static/thesiah.sh
@@ -283,27 +283,10 @@ makeuserjs() {
   arkenfox="$sipdir/arkenfox.js"
   overrides="$sipdir/user-overrides.js"
   userjs="$sipdir/user.js"
-  ln -fs "/home/$name/.config/firefox/thesiah.js" "$overrides"
+  ln -fs "/home/$name/.dotfiles/ar/.config/firefox/thesiah.js" "$overrides"
   [ ! -f "$arkenfox" ] && curl -sL "https://raw.githubusercontent.com/arkenfox/user.js/master/user.js" >"$arkenfox"
-  chown "$name:wheel" "$arkenfox" "$userjs"
   cat "$arkenfox" "$overrides" >"$userjs"
-  # Install the updating script.
-  mkdir -p /usr/local/lib /etc/pacman.d/hooks
-  cp "/home/$name/.local/bin/arkenfox-auto-update" /usr/local/lib/
-  chown root:root /usr/local/lib/arkenfox-auto-update
-  chmod 755 /usr/local/lib/arkenfox-auto-update
-  # Trigger the update when needed via a pacman hook.
-  printf '[Trigger]
-Operation = Upgrade
-Type = Package
-Target = firefox
-Target = librewolf-bin
-Target = librewolf
-[Action]
-Description=Update Arkenfox user.js
-When=PostTransaction
-Depends=arkenfox-user.js
-Exec=/usr/local/lib/arkenfox-auto-update' >/etc/pacman.d/hooks/arkenfox.hook
+  chown "$name:wheel" "$arkenfox" "$userjs"
 }
 
 installffaddons() {
@@ -331,10 +314,13 @@ installffaddons() {
   chown -R "$name:$name" "$sipdir/extensions"
 }
 
-librewolfsetup() {
+browsersetup() {
   whiptail --infobox "Setting browser privacy settings and add-ons..." 7 60
 
-  browserdir="/home/$name/.librewolf"
+  case "$1" in
+  firefox) browserdir="/home/$name/.mozilla/firefox" ;;
+  librewolf) browserdir="/home/$name/.librewolf" ;;
+  esac
   profilesini="$browserdir/profiles.ini"
 
   sudo -u "$name" librewolf --headless >/dev/null 2>&1 &
@@ -354,7 +340,7 @@ librewolfsetup() {
     error "User exited."
   fi
 
-  pkill -u "$name" librewolf
+  pkill -u "$name" "$1"
 }
 
 addsudo() {
@@ -857,8 +843,9 @@ tlpsetup || error "User exited."
 # Set up bbswitch
 bbswitchsetup || error "User exited."
 
-# Get Librewolf installed with add-ons and non-bad settings.
-librewolfsetup || error "User exited."
+# Get browser installed with add-ons and non-bad settings.
+browsersetup "firefox" || error "User exited."
+browsersetup "librewolf" || error "User exited."
 
 # Clone TheSiahxyz's repositories
 [ "$putrepo" = "y" ] && {