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

Guard-clause-style scpace checks

This commit is contained in:
Sage Vaillancourt 2024-02-19 01:37:07 -05:00
parent b96fff3c6a
commit 3132e9ce0d
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fake_home/.zshrc
View File

@ -105,13 +105,13 @@ function dconf-dump {
}
function push-dconf {
if command -v scpace &> /dev/null; then
rm /tmp/dconf-dump &> /dev/null
dconf-dump > /tmp/dconf-dump || return 1
scp -P 11275 /tmp/dconf-dump 'sage@sagev.space:~/dconf-dump'
else
if ! command -v scpace &> /dev/null; then
echo "An alias for scpace has not been defined on this device!"
return 1
fi
rm /tmp/dconf-dump &> /dev/null
dconf-dump > /tmp/dconf-dump || return 1
scp -P 11275 /tmp/dconf-dump 'sage@sagev.space:~/dconf-dump'
}
function pushdot {
@ -129,25 +129,25 @@ function pushdot {
}
function getdot {
if ! command -v scpace &> /dev/null; then
echo "An alias for scpace has not been defined on this device!"
return 1
fi
cd "$DOT_DIR" || return 1
git pull && ./copy.sh
if command -v scpace &> /dev/null; then
rm /tmp/dconf-dump
scp -P 11275 'sage@sagev.space:~/dconf-dump' /tmp/dconf-dump
dconf-dump > /tmp/current-dconf-dump
if ! git --no-pager diff --no-index /tmp/current-dconf-dump /tmp/dconf-dump &> /dev/null; then
echo
echo "Incoming conf changes:"
echo
git --no-pager diff --no-index /tmp/current-dconf-dump /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 / < /tmp/dconf-dump || return 1
else
echo "An alias for scpace has not been defined on this device!"
rm /tmp/dconf-dump
scp -P 11275 'sage@sagev.space:~/dconf-dump' /tmp/dconf-dump
dconf-dump > /tmp/current-dconf-dump
if ! git --no-pager diff --no-index /tmp/current-dconf-dump /tmp/dconf-dump &> /dev/null; then
echo
echo "Incoming conf changes:"
echo
git --no-pager diff --no-index /tmp/current-dconf-dump /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 / < /tmp/dconf-dump || return 1
cd - > /dev/null
}