From fceda9bd356359b05210d09c49c716aae8bb8578 Mon Sep 17 00:00:00 2001 From: clsty Date: Thu, 30 Oct 2025 22:09:09 +0800 Subject: [PATCH] Rename var --- sdata/subcmd-install/3.files-exp.sh | 8 ++++---- sdata/subcmd-install/3.files.sh | 4 ++-- sdata/subcmd-install/3.files.yaml | 2 +- sdata/subcmd-install/options.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdata/subcmd-install/3.files-exp.sh b/sdata/subcmd-install/3.files-exp.sh index f35229535..778fd3ba7 100644 --- a/sdata/subcmd-install/3.files-exp.sh +++ b/sdata/subcmd-install/3.files-exp.sh @@ -83,10 +83,10 @@ for pattern in "${patterns[@]}"; do condition=$(echo "$pattern" | yq '.condition // "true"') # Handle fontconfig fontset override - # If II_FONTSET_NAME is set and this is the fontconfig pattern, use the fontset instead - if [[ "$from" == "dots/.config/fontconfig" ]] && [[ -n "${II_FONTSET_NAME:-}" ]]; then - from="dots-extra/fontsets/${II_FONTSET_NAME}" - echo "Using fontset \"${II_FONTSET_NAME}\" for fontconfig" + # If FONTSET_DIR_NAME is set and this is the fontconfig pattern, use the fontset instead + if [[ "$from" == "dots/.config/fontconfig" ]] && [[ -n "${FONTSET_DIR_NAME:-}" ]]; then + from="dots-extra/fontsets/${FONTSET_DIR_NAME}" + echo "Using fontset \"${FONTSET_DIR_NAME}\" for fontconfig" fi # Check if pattern should be processed diff --git a/sdata/subcmd-install/3.files.sh b/sdata/subcmd-install/3.files.sh index ead48593f..8e92fed2c 100644 --- a/sdata/subcmd-install/3.files.sh +++ b/sdata/subcmd-install/3.files.sh @@ -103,9 +103,9 @@ esac case $SKIP_FONTCONFIG in true) sleep 0;; *) - case "$II_FONTSET_NAME" in + case "$FONTSET_DIR_NAME" in "") warning_rsync_delete; v rsync -av --delete dots/.config/fontconfig/ "$XDG_CONFIG_HOME"/fontconfig/ ;; - *) warning_rsync_delete; v rsync -av --delete dots-extra/fontsets/$II_FONTSET_NAME/ "$XDG_CONFIG_HOME"/fontconfig/ ;; + *) warning_rsync_delete; v rsync -av --delete dots-extra/fontsets/$FONTSET_DIR_NAME/ "$XDG_CONFIG_HOME"/fontconfig/ ;; esac;; esac diff --git a/sdata/subcmd-install/3.files.yaml b/sdata/subcmd-install/3.files.yaml index a9f2985f2..59ed69ebc 100644 --- a/sdata/subcmd-install/3.files.yaml +++ b/sdata/subcmd-install/3.files.yaml @@ -57,7 +57,7 @@ patterns: - from: "dots/.local/share/konsole" to: "$XDG_DATA_HOME/konsole" mode: "soft" - # Fontconfig (default - fontsets handled separately if II_FONTSET_NAME is set) + # Fontconfig (default - fontsets handled separately if FONTSET_DIR_NAME is set) - from: "dots/.config/fontconfig" to: "$XDG_CONFIG_HOME/fontconfig" mode: "sync" diff --git a/sdata/subcmd-install/options.sh b/sdata/subcmd-install/options.sh index dba8a4430..ec466dfe9 100644 --- a/sdata/subcmd-install/options.sh +++ b/sdata/subcmd-install/options.sh @@ -81,7 +81,7 @@ while true ; do ## Ones with parameter --fontset) if [[ -d "${REPO_ROOT}/dots-extra/fontsets/$2" ]]; - then echo "Using fontset \"$2\".";II_FONTSET_NAME="$2";shift 2 + then echo "Using fontset \"$2\".";FONTSET_DIR_NAME="$2";shift 2 else echo "Wrong argument for $1.";exit 1 fi;;