summaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
Diffstat (limited to 'sh')
-rw-r--r--sh/aliases6
-rw-r--r--sh/functions3
2 files changed, 6 insertions, 3 deletions
diff --git a/sh/aliases b/sh/aliases
index 93784e7..2e7ecf5 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -19,10 +19,10 @@ case `uname -s` in
;;
"Linux")
#alias ls="ls -h $COLOR_FLAGS_GNU"
- alias ls="eza"
+ type eza >/dev/null && alias ls="eza"
;;
"Darwin")
- alias ls="eza --color"
+ type eza >/dev/null && alias ls="eza --color"
;;
esac
alias ll='ls -l'
@@ -44,7 +44,7 @@ case `uname -s` in
alias rm='rm -i'
;;
"Linux")
- alias rm='trash-put'
+ type trash-put >/dev/null && alias rm='trash-put'
;;
esac
alias cp='cp -i'
diff --git a/sh/functions b/sh/functions
index e8515d8..7a9f715 100644
--- a/sh/functions
+++ b/sh/functions
@@ -36,6 +36,9 @@ if [[ "$SHELL" =~ .*zsh$ ]]; then
if [[ $1 != *"veracrypt"* ]]; then
print -sr -- "${1%%$'\n'}"
fc -p
+ elif [[ $1 != *"cryptsetup"* ]]; then
+ print -sr -- "${1%%$'\n'}"
+ fc -p
else
return 1
fi