Compare commits
No commits in common. "1e1ee467f6dd080dd918838eafec459e9c8e561b" and "2b0836d477c24951d6d97010b2c13ed59f6af2d9" have entirely different histories.
1e1ee467f6
...
2b0836d477
|
@ -102,16 +102,12 @@ function push-dconf {
|
|||
|
||||
function pushdot {
|
||||
cd "$DOT_DIR" || return 1
|
||||
local res
|
||||
if [ $# -eq 0 ]; then
|
||||
git commit -a && git push -u origin main && push-dconf
|
||||
res="$?"
|
||||
else
|
||||
git commit -a -m "$@" && git push -u origin main && push-dconf
|
||||
res="$?"
|
||||
fi
|
||||
cd -
|
||||
return $res
|
||||
}
|
||||
|
||||
function getdot {
|
||||
|
@ -121,12 +117,7 @@ function getdot {
|
|||
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
|
||||
fi
|
||||
git --no-pager diff --no-index /tmp/dconf-dump /tmp/current-dconf-dump
|
||||
dconf load / < /tmp/dconf-dump || return 1
|
||||
else
|
||||
echo "An alias for scpace has not been defined on this device!"
|
||||
|
|
Loading…
Reference in New Issue