diff --git a/bin/dotfiles-sync.sh b/bin/dotfiles-sync.sh index 9d07043..bed6f36 100755 --- a/bin/dotfiles-sync.sh +++ b/bin/dotfiles-sync.sh @@ -5,7 +5,16 @@ set -e -readonly DOTFILES_HOME="${DOTFILES_HOME:-.}" +readonly DOTFILES_HOME="${DOTFILES_HOME:-$HOME/.dotfiles}" + +# Source shared colors +source "$DOTFILES_HOME/zsh/lib/colors.zsh" 2>/dev/null || { + DF_RED=$'\033[0;31m' DF_GREEN=$'\033[0;32m' DF_YELLOW=$'\033[1;33m' + DF_BLUE=$'\033[0;34m' DF_CYAN=$'\033[0;36m' DF_MAGENTA=$'\033[0;35m' + DF_NC=$'\033[0m' DF_GREY=$'\033[38;5;242m' DF_LIGHT_BLUE=$'\033[38;5;39m' + DF_BOLD=$'\033[1m' DF_DIM=$'\033[2m' DF_LIGHT_GREEN=$'\033[38;5;82m' +} + # Color codes readonly RED='\033[0;31m' @@ -33,29 +42,33 @@ source "$DOTFILES_HOME/zsh/lib/colors.zsh" 2>/dev/null || { DF_WIDTH=66 print_header() { - local user="${USER:-root}" - local hostname="${HOSTNAME:-$(hostname -s 2>/dev/null)}" - local script_name="dotfiles-sync" - local datetime=$(date '+%a %b %d %H:%M') + if declare -f df_print_header &>/dev/null; then + df_print_header "dotfiles-sync" + else + local user="${USER:-root}" + local hostname="${HOSTNAME:-$(hostname -s 2>/dev/null)}" + local script_name="dotfiles-sync" + local datetime=$(date '+%a %b %d %H:%M') - # Build horizontal line - local hline="" - for ((i=0; i/dev/null || { DF_GREEN=$'\033[0;32m' DF_YELLOW=$'\033[1;33m' DF_CYAN=$'\033[0;36m' DF_NC=$'\033[0m' DF_GREY=$'\033[38;5;242m' DF_LIGHT_BLUE=$'\033[38;5;39m' - DF_BOLD=$'\033[1m' DF_DIM=$'\033[2m' + DF_BOLD=$'\033[1m' DF_DIM=$'\033[2m' DF_LIGHT_GREEN=$'\033[38;5;82m' } CHECK_ONLY=false @@ -54,10 +54,10 @@ print_header() { local datetime=$(date '+%a %b %d %H:%M') local width=66 local hline="" && for ((i=0; i