Always apply dsync changes.

This commit is contained in:
Sage Vaillancourt 2024-02-28 19:54:49 -05:00
parent e2b9a3acfe
commit b9982fd8a5
1 changed files with 9 additions and 9 deletions

View File

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