diff options
| -rw-r--r-- | config/essentials/zsh/.zshrc | 2 | ||||
| -rw-r--r-- | config/essentials/zsh/aliases.zsh | 4 | ||||
| -rwxr-xr-x | stowdots | 26 |
3 files changed, 20 insertions, 12 deletions
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 4a28ce2..83da0f6 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -28,7 +28,7 @@ zle -N add-surround surround zle -N change-surround surround compinit -if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null +if grep -qi "debian\|ubuntu" /etc/os-release 2>/dev/null then sfiles=( /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 1c5c6e1..adb7e33 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -1,7 +1,7 @@ #!/bin/zsh # s/alias \([^-]\)/alias -g \1 -if grep -qi "debian\|ubuntu" /etc/os-release +if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null then alias aptup='apt update && apt upgrade -y' fi @@ -54,7 +54,7 @@ alias lst3='ls --tree -L3' alias ls.='ls -dl .*' which exa >/dev/null 2>&1 && alias ls='exa --sort extension --group-directories-first' || - alias ls='ls --color --group-directories-fist --sort=extension' + alias ls='ls --color --group-directories-first --sort=extension' # pacman aliases alias pac='pacman' @@ -1,20 +1,28 @@ #!/bin/sh -trap "echo -ne '\nbye'; exit 1" EXIT +trap "echo -e '\nbye'; exit 1" EXIT + +die () { + echo "$@" 1>&2 +} if ! stow --version > /dev/null 2>&1 then - echo "E: stow not installed or not found" 1>&2 - exit 1 + die "stow not installed or not found." + die "install stow?" + die -n ">" + test "y" = "$(head -n 1)" && + doas pacman -Sy stow || + exit 1 fi if [ -n "${MACH:=$1}" ] then - echo "I: stowing for $MACH" + die "I: stowing for $MACH" else - echo "E: MACH not set" 1>&2 - echo "Enter valid value for 'MACH'" - echo "d(esktop) | s(erver) | l(aptop)" - echo -n ">" + die "E: MACH not set" >&2 + die "Enter valid value for 'MACH'" + die "d(esktop) | s(erver) | l(aptop)" + echo -n ">" >&2 read MACH fi @@ -34,6 +42,6 @@ case "$MACH" in stow -d config/ -t "$HOME/" -R home ;; *) - echo "E: invalid value for 'MACH'" 1>&2 + die "E: invalid value for 'MACH'" break esac |