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

Compare commits

base: sage:1e1ee467f6dd080dd918838eafec459e9c8e561b
Branches Tags
sage:main
sage:master
..
compare: sage:2b0836d477c24951d6d97010b2c13ed59f6af2d9
Branches Tags
sage:main
sage:master

No commits in common. "1e1ee467f6dd080dd918838eafec459e9c8e561b" and "2b0836d477c24951d6d97010b2c13ed59f6af2d9" have entirely different histories.
1e1ee467f6 ... 2b0836d477

1 changed files with 1 additions and 10 deletions
Show Stats Expand all files Collapse all files

11
fake_home/.zshrc
View File

@ -102,16 +102,12 @@ function push-dconf {
function pushdot { function pushdot {
cd "$DOT_DIR" || return 1 cd "$DOT_DIR" || return 1
local res
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
git commit -a && git push -u origin main && push-dconf git commit -a && git push -u origin main && push-dconf
res="$?"
else else
git commit -a -m "$@" && git push -u origin main && push-dconf git commit -a -m "$@" && git push -u origin main && push-dconf
res="$?"
fi fi
cd - cd -
return $res
} }
function getdot { function getdot {
@ -121,12 +117,7 @@ function getdot {
rm /tmp/dconf-dump rm /tmp/dconf-dump
scp -P 11275 'sage@sagev.space:~/dconf-dump' /tmp/dconf-dump scp -P 11275 'sage@sagev.space:~/dconf-dump' /tmp/dconf-dump
dconf-dump > /tmp/current-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 git --no-pager diff --no-index /tmp/dconf-dump /tmp/current-dconf-dump
echo
echo "Incoming conf changes:"
echo
git --no-pager diff --no-index /tmp/current-dconf-dump /tmp/dconf-dump
fi
dconf load / < /tmp/dconf-dump || return 1 dconf load / < /tmp/dconf-dump || return 1
else else
echo "An alias for scpace has not been defined on this device!" echo "An alias for scpace has not been defined on this device!"