Wrap firefox launch in bash

Re-enable dconf diff viewing
This commit is contained in:
Sage Vaillancourt 2024-04-09 07:17:26 -04:00
parent 9408d4a109
commit dc2b1ce01f
2 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash
kill $(pgrep firefox)
gnome-terminal -e "$HOME/.bin/update-firefox.sh && MOZ_ENABLE_WAYLAND=1 setsid $HOME/.bin/firefox-developer-edition/firefox-bin"
gnome-terminal -- bash -c "$HOME/.bin/update-firefox.sh && MOZ_ENABLE_WAYLAND=1 setsid $HOME/.bin/firefox-developer-edition/firefox-bin"
test -f "$HOME/.aws.exp" && bash -c "sleep 10; $HOME/.aws.exp" &> "$HOME/.aws.exp.log"
wait

View File

@ -204,15 +204,15 @@ function sync-dconf {
rm $HOME/.tmp/dconf-dump &> /dev/null
scp -P 11275 'sage@sagev.space:~/dconf-dump' $HOME/.tmp/dconf-dump
dconf-dump > $HOME/.tmp/current-dconf-dump
# if ! git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump &> /dev/null; then
# echo
# echo "Incoming conf changes:"
# echo
# git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump
# echo
# bash -c 'read -p "Press enter to continue, or Ctrl-C to cancel."' || return 1
# echo "Applying changes..."
# fi
if ! git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump &> /dev/null; then
echo
echo "Incoming conf changes:"
echo
git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump
echo
bash -c 'read -p "Press enter to continue, or Ctrl-C to cancel."' || return 1
echo "Applying changes..."
fi
dconf load / < $HOME/.tmp/dconf-dump || return 1
push-dconf
}