Compare commits
2 Commits
2b0836d477
...
1e1ee467f6
Author | SHA1 | Date |
---|---|---|
Sage Vaillancourt | 1e1ee467f6 | |
Sage Vaillancourt | 99e817e42c |
|
@ -102,12 +102,16 @@ 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 {
|
||||||
|
@ -117,7 +121,12 @@ 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
|
||||||
git --no-pager diff --no-index /tmp/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
|
||||||
|
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!"
|
||||||
|
|
Loading…
Reference in New Issue