Update conditional checks and add yadm pre_commit hook
This commit is contained in:
parent
d3ba8c473d
commit
1251bb4eab
5 changed files with 45 additions and 9 deletions
|
@ -71,17 +71,17 @@ alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"'
|
||||||
|
|
||||||
### conditionals
|
### conditionals
|
||||||
|
|
||||||
[ -x "$(command -v bat)" ] && alias cat='bat -pp'
|
test -x "$(command -v bat)" && alias cat='bat -pp'
|
||||||
|
|
||||||
[ -x "$(command -v eza)" ] && alias ls='eza -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first'
|
test -x "$(command -v eza)" && alias ls='eza -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first'
|
||||||
|
|
||||||
[ -x "$(command -v moar)" ] && alias less='moar'
|
test -x "$(command -v moar)" && alias less='moar'
|
||||||
|
|
||||||
[ -x "$(command -v nvim)" ] && alias vim='nvim'
|
test -x "$(command -v nvim)" && alias vim='nvim'
|
||||||
|
|
||||||
[ -x "$(command -v rmtrash)" ] && alias rm='rmtrash -I --one-file-system'
|
test -x "$(command -v rmtrash)" && alias rm='rmtrash -I --one-file-system'
|
||||||
[ -x "$(command -v rmdirtrash)" ] && alias rmdir='rmdirtrash'
|
test -x "$(command -v rmdirtrash)" && alias rmdir='rmdirtrash'
|
||||||
|
|
||||||
[ ! -x "$(command -v yadm)" ] && alias yadm='git --git-dir="$HOME/.local/share/yadm/repo.git"'
|
test ! -x "$(command -v yadm)" && alias yadm='git --git-dir="$HOME/.local/share/yadm/repo.git"'
|
||||||
|
|
||||||
[ -f "$HOME/.config/aliasrc.local" ] && . "$HOME/.config/aliasrc.local"
|
test -x "$HOME/.config/aliasrc.local" && . "$HOME/.config/aliasrc.local"
|
||||||
|
|
|
@ -52,6 +52,6 @@ for additional_env in "$XDG_CONFIG_HOME/env.d/"*; do
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# shellcheck disable=1090
|
# shellcheck disable=1090
|
||||||
test -r "$additional_env" && . "$additional_env"
|
test -x "$additional_env" && . "$additional_env"
|
||||||
done
|
done
|
||||||
unset additional_env
|
unset additional_env
|
||||||
|
|
5
.config/yadm/hooks/post_pull
Executable file
5
.config/yadm/hooks/post_pull
Executable file
|
@ -0,0 +1,5 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
echo "Running post pull script..."
|
||||||
|
|
||||||
|
autoinstall base
|
1
.config/yadm/hooks/pre_ci
Symbolic link
1
.config/yadm/hooks/pre_ci
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
pre_commit
|
30
.config/yadm/hooks/pre_commit
Executable file
30
.config/yadm/hooks/pre_commit
Executable file
|
@ -0,0 +1,30 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
# Check encrypted files for newer versions
|
||||||
|
files="$HOME/.config/yadm/encrypt"
|
||||||
|
archive="$HOME/.local/share/yadm/archive"
|
||||||
|
new_files=false
|
||||||
|
|
||||||
|
echo "Checking for newer versions of encrypted files..."
|
||||||
|
while IFS= read -r file
|
||||||
|
do
|
||||||
|
if test "$HOME/$file" -nt "$archive"
|
||||||
|
then
|
||||||
|
echo "WARNING: ~/$file is newer than the archive!"
|
||||||
|
new_files=true
|
||||||
|
fi
|
||||||
|
done < "$files"
|
||||||
|
|
||||||
|
if $new_files
|
||||||
|
then
|
||||||
|
echo "WARNING: There are newer versions of encrypted files!"
|
||||||
|
echo "WARNING: Please consider re-encrypting them."
|
||||||
|
printf "Continue? [y/N] "
|
||||||
|
read -r answer
|
||||||
|
if [ "$answer" = "n" ] || [ "$answer" = "N" ]
|
||||||
|
then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "All encrypted files are up to date."
|
||||||
|
fi
|
Loading…
Reference in a new issue