sage
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fake_home/.zshrc
View File

@ -192,15 +192,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
}