fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

install: improve log output

Browse source
This commit is contained in:
Fernando Schauenburg 2022-02-02 17:56:33 +01:00
parent 73bde45645
commit 9263665843
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
install.sh
View file

@ -79,7 +79,7 @@ nvim_extras() {
heading 'nvim plugins' heading 'nvim plugins'
if command -v nvim >/dev/null 2>&1; then if command -v nvim >/dev/null 2>&1; then
dry_run || { dry_run || {
change "installing neovim plugins..." warn "installing neovim plugins..."
nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
} }
else else
@ -121,15 +121,21 @@ usage() {
heading() { printf '%s\n' "${blue}===== $1 ==========${rst}"; } heading() { printf '%s\n' "${blue}===== $1 ==========${rst}"; }
info() { printf '%s ' "$@"; printf '\n'; } info() { printf '%s ' "$@"; printf '\n'; }
ok() { printf '%s ' "${green}OK:${rst}" "$@"; printf '\n'; }
change() { printf '%s ' "${yellow}CHANGE:${rst}" "$@"; printf '\n'; }
warn() { printf '%s ' "${yellow}$@${rst}"; printf '\n'; } warn() { printf '%s ' "${yellow}$@${rst}"; printf '\n'; }
error() { printf '%s ' "${red}$@${rst}"; printf '\n'; } error() { printf '%s ' "${red}$@${rst}"; printf '\n'; }
log() {
case "$1" in
OK|ok) color=$green;;
*) color=$yellow;;
esac
printf '%s%-*s%s %s\n' "$color" 6 "$1:" "$rst" "$2"
}
# Make sure directory $1 exists. # Make sure directory $1 exists.
ensure_directory() { ensure_directory() {
[ -d "$1" ] && return [ -d "$1" ] && return
change "MKDIR $1/" log MKDIR "$1/"
dry_run || mkdir -p "$1/" dry_run || mkdir -p "$1/"
} }
@ -140,7 +146,7 @@ prune_cmd() {
case "$target" in case "$target" in
"$DOTFILES/bin/"*) # ... pointing into dotfiles bin "$DOTFILES/bin/"*) # ... pointing into dotfiles bin
if [ ! -e "$1" ]; then # target of the link missing if [ ! -e "$1" ]; then # target of the link missing
change "UNLINK (stale) $1 -> $target" log UNLINK "(stale) $1 -> $target"
dry_run || rm -f "$1" dry_run || rm -f "$1"
fi fi
;; ;;
@ -151,19 +157,25 @@ prune_cmd() {
# Make sure $1 is a (relative) symlink to $2. # Make sure $1 is a (relative) symlink to $2.
link() { link() {
target="$(python -c "import os; print os.path.relpath('$2','$(dirname $1)')")" target="$(python -c "import os; print os.path.relpath('$2','$(dirname $1)')")"
[ "$(readlink "$1")" = "$target" ] && { ok "$1 -> $target"; return; } if [ "$(readlink "$1")" = "$target" ]; then
change "LINK $1 -> $target" log OK "$1 -> $target"
else
log LINK "$1 -> $target"
dry_run || ln -sf "$target" "$1" dry_run || ln -sf "$target" "$1"
fi
} }
# Ensure $1 and $2 contents are equal, updating $1 if needed. # Ensure $1 and $2 contents are equal, updating $1 if needed.
equal_content() { equal_content() {
diff "$1" "$2" >/dev/null 2>&1 && { ok "$1"; return; } if diff "$1" "$2" >/dev/null 2>&1; then
change "OVERWRITE $1 with $2:" log OK "$1"
else
log OVERWRITE "$1 with $2:"
echo "$cyan" echo "$cyan"
cat "$2" cat "$2"
echo "$rst" echo "$rst"
dry_run || cp -f "$2" "$1" dry_run || cp -f "$2" "$1"
fi
} }
# Deploy package by creating subdirs and symlinks to dotfiles. # Deploy package by creating subdirs and symlinks to dotfiles.