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

bin: fix mouling

This commit is contained in:
xeruf 2022-12-22 15:40:56 +01:00
parent 655bd6bdc7
commit b3989a1969
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.local/bin/scripts/bag
View File

@ -15,7 +15,7 @@ test $# -gt 0 || cd "$root"
name="::$(test -n "$name" && echo "$name" || cat /etc/hostname)_${1:-system}_$(date -u +"%y%m%d")" name="::$(test -n "$name" && echo "$name" || cat /etc/hostname)_${1:-system}_$(date -u +"%y%m%d")"
echo "Backing up as $name" echo "Backing up as $name"
${run:-sudo --preserve-env=BORG_REPO BORG_PASSPHRASE="$($BORG_PASSCOMMAND)" borg} create --exclude-caches $args \ ${run:-sudo --preserve-env=BORG_REPO BORG_PASSPHRASE="$($BORG_PASSCOMMAND)" borg} create --exclude-caches $args \
$(echo $DIRS_IGNORE_SAFE -x 'software-challenge/**/build' -x state/emacs -x state/go -x .local/lib -x .cpan -x *cache | $(echo $DIRS_IGNORE_SAFE -x 'software-challenge/**/build' -x state/emacs -x state/go -x .local/lib -x .cpan -x *cache -x $HOME/.gem |
sed 's|-x \([^ ]\+\)|-e sh:**/\1|g') \ sed 's|-x \([^ ]\+\)|-e sh:**/\1|g') \
"$name" $(test $# -eq 0 && echo etc home root || test $# -eq 1 && echo $1) "${@:2}" 2>&1 "$name" $(test $# -eq 0 && echo etc home root || test $# -eq 1 && echo $1) "${@:2}" 2>&1
test -n "$run" || sudo chown -R $USER:$USER "$BORG_REPO" test -n "$run" || sudo chown -R $USER:$USER "$BORG_REPO"

7
.local/bin/scripts/moul
View File

@ -16,18 +16,19 @@ case $1 in
code=$? code=$?
sudo rm -df "$last" sudo rm -df "$last"
exit $code;; exit $code;;
(*) arg=$1;; (*) arg=$1
shift;;
esac esac
# FSTAB: BY LABEL # FSTAB: BY LABEL
if grep --word-regexp "LABEL=$arg" /etc/fstab if grep --word-regexp "LABEL=$arg" /etc/fstab
then # have to mount twice as the first one might be creating the directory then # have to mount twice as the first one might be creating the directory
mount -L "$@" 2>/dev/null || mount -L "$@" mount -L "$arg" "$@" 2>/dev/null || mount -L "$arg" "$@"
exit $? exit $?
fi fi
# FSTAB: BY MOUNTPOINT/NAME # FSTAB: BY MOUNTPOINT/NAME
if grep --word-regexp "$arg" /etc/fstab if grep --word-regexp "$arg" /etc/fstab
then mount "$@"; exit $? then mount "$arg" "$@"; exit $?
fi fi
# MANUALLY # MANUALLY