From 14a46622c360f5a603f3965ba71389f4ae98cf7f Mon Sep 17 00:00:00 2001 From: clsty Date: Thu, 16 Oct 2025 10:31:13 +0800 Subject: [PATCH] Fix naming --- sdata/step/3.install-files.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdata/step/3.install-files.sh b/sdata/step/3.install-files.sh index d91c215b7..100f52841 100644 --- a/sdata/step/3.install-files.sh +++ b/sdata/step/3.install-files.sh @@ -9,8 +9,8 @@ function warning_rsync(){ printf "${STY_RESET}" } -function backup_clashing_dirs(){ - # For folders/files under target_dir, only backup those which clashes with the ones under source_dir +function backup_clashing_targets(){ + # For dirs/files under target_dir, only backup those which clashes with the ones under source_dir local source_dir="$1" local target_dir="$2" local backup_dir="$3" @@ -46,13 +46,13 @@ function backup_clashing_dirs(){ function ask_backup_configs(){ printf "${STY_RED}" - printf "Would you like to backup clashing dirs under \"$XDG_CONFIG_HOME\" and \"$XDG_DATA_HOME\" to \"$BACKUP_DIR\"?" + printf "Would you like to backup clashing dirs/files under \"$XDG_CONFIG_HOME\" and \"$XDG_DATA_HOME\" to \"$BACKUP_DIR\"?" read -p "[y/N] " backup_confirm case $backup_confirm in [yY][eE][sS]|[yY]) - showfun backup_clashing_dirs - v backup_clashing_dirs dots/.config $XDG_CONFIG_HOME "${BACKUP_DIR}/.config" - v backup_clashing_dirs dots/.local/share $XDG_DATA_HOME "${BACKUP_DIR}/.local/share" + showfun backup_clashing_targets + v backup_clashing_targets dots/.config $XDG_CONFIG_HOME "${BACKUP_DIR}/.config" + v backup_clashing_targets dots/.local/share $XDG_DATA_HOME "${BACKUP_DIR}/.local/share" ;; *) echo "Skipping backup..." ;; esac @@ -61,7 +61,7 @@ function ask_backup_configs(){ ##################################################################################### -# In case some folders does not exists +# In case some dirs does not exists v mkdir -p $XDG_BIN_HOME $XDG_CACHE_HOME $XDG_CONFIG_HOME $XDG_DATA_HOME case $ask in