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

bin: improve label handling in moul

This commit is contained in:
xeruf 2021-11-04 12:19:43 +01:00
parent c4a726d644
commit 7376729faf
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.local/bin/scripts/moul
View File

@ -9,13 +9,17 @@ then shift
sudo rm -d "$mountpoint" sudo rm -d "$mountpoint"
exit $? exit $?
fi fi
mountpoint="${2:-${XDG_RUNTIME_DIR}/mnt/$1}"
grep -e "[^\w/]$1[^\w/]" /etc/fstab && mount "$1" && exit 0 grep -e "[^\w=/]$1[^\w/]" /etc/fstab && mount "$@" && exit 0
grep -e "[^\w/]$mountpoint[^\w/]" /etc/fstab && mount "$mountpoint" && exit 0 case "$1" in
case "$1" in (sd*|loop*|nvme*) partition="/dev/$1";; (*) partition="-L $1";; esac (sd*|loop*|nvme*|md*|dm*|vg*) partition="/dev/$1"
mountpoint="${2:-${MNT:-${XDG_RUNTIME_DIR}/mnt}/$1}"
grep -e "[^\w=/]$mountpoint[^\w/]" /etc/fstab && shift && mount "$mountpoint" "$@" && exit 0;;
(*) partition="-L $1";;
esac
shift $(expr 2 \& $# \> 1 \| 1)
#uid=$(id --user),gid=$(id --group), \ #uid=$(id --user),gid=$(id --group), \
mountpoint "$mountpoint" >/dev/null 2>&1 || sudo mount -vo \ mountpoint "$mountpoint" >/dev/null 2>&1 || sudo mount -vo \
users,X-mount.mkdir $partition "$mountpoint" "${@:3}" users,X-mount.mkdir,noatime $partition $mountpoint "$@"
cd $mountpoint cd $mountpoint
exec $SHELL exec $SHELL

11
.zprofile
View File

@ -10,6 +10,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
export PATH="$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:$XDG_CONFIG_HOME/emacs/bin" export PATH="$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:$XDG_CONFIG_HOME/emacs/bin"
# adjust programs to use xdg # adjust programs to use xdg
export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
export MNT="$XDG_RUNTIME_DIR"/mnt
export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
export GNUPGHOME="$XDG_DATA_HOME"/gnupg export GNUPGHOME="$XDG_DATA_HOME"/gnupg
@ -20,7 +21,7 @@ export CARGO_HOME="$XDG_DATA_HOME"/cargo
export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
export RLWRAP_HOME="$XDG_STATE_HOME"/rlwrap export RLWRAP_HOME="$XDG_DATA_HOME"/rlwrap
export CABAL_CONFIG="$XDG_CONFIG_HOME"/cabal/config export CABAL_CONFIG="$XDG_CONFIG_HOME"/cabal/config
export CABAL_DIR="$XDG_CACHE_HOME"/cabal export CABAL_DIR="$XDG_CACHE_HOME"/cabal
@ -71,7 +72,7 @@ export LESS_TERMCAP_se=$'\e[0m' # reset reverse video
export LESS_TERMCAP_ue=$'\e[0m' # reset underline export LESS_TERMCAP_ue=$'\e[0m' # reset underline
export GROFF_NO_SGR=1 # for konsole and gnome-terminal export GROFF_NO_SGR=1 # for konsole and gnome-terminal
## fzf defaults ## fzf defaults
FZF_BINDINGS=$(echo ' FZF_BINDINGS=$(echo "
change:top change:top
alt-enter:execute(test -O {} && $EDITOR {} || sudoedit {}) alt-enter:execute(test -O {} && $EDITOR {} || sudoedit {})
alt-bspace:execute(gio trash {}) alt-bspace:execute(gio trash {})
@ -83,9 +84,9 @@ alt-c:yank
alt-w:toggle-preview-wrap alt-w:toggle-preview-wrap
alt-j:preview-half-page-down,alt-k:preview-half-page-up alt-j:preview-half-page-down,alt-k:preview-half-page-up
shift-down:preview-half-page-down,shift-up:preview-half-page-up shift-down:preview-half-page-down,shift-up:preview-half-page-up
alt-shift-down:preview-down,alt-shift-up:preview-up $([[ $(fzf --version | cut -d '.' -f-2) > 0.24 ]] && echo "alt-shift-down:preview-down,alt-shift-up:preview-up")
esc:close esc:close
' | xargs -I% echo -n "%," | head -c-1) " | xargs -I% echo -n "%," | head -c-1)
#alt-r:preview(bat {}), #alt-r:preview(bat {}),
export FZF_HISTDIR="$XDG_STATE_HOME/fzf" export FZF_HISTDIR="$XDG_STATE_HOME/fzf"
mkdir -p "$XDG_STATE_HOME/fzf" mkdir -p "$XDG_STATE_HOME/fzf"
@ -100,7 +101,7 @@ export CTEST_PROGRESS_OUTPUT=1
export CTEST_OUTPUT_ON_FAILURE=1 export CTEST_OUTPUT_ON_FAILURE=1
export CTEST_PARALLEL_LEVEL=3 export CTEST_PARALLEL_LEVEL=3
if test -z "${DISPLAY}" && test "$XDG_VTNR" -eq 1 && test -d "$JOURNAL"; then if test -z "$DISPLAY" && test "$XDG_VTNR" -eq 1 && test -d "$JOURNAL"; then
echo "What do you want to do?" echo "What do you want to do?"
while test $(echo "$intention" | wc -c) -lt 6 while test $(echo "$intention" | wc -c) -lt 6
do read intention do read intention