generated from osc/skins-template
yeah i have no idea
All checks were successful
CI/CD Pipeline / Full CI/CD Pipeline (push) Successful in 14s
All checks were successful
CI/CD Pipeline / Full CI/CD Pipeline (push) Successful in 14s
This commit is contained in:
@@ -673,18 +673,30 @@ jobs:
|
|||||||
echo "Processing ordered skin: $skin"
|
echo "Processing ordered skin: $skin"
|
||||||
ordered["$skin"]=1
|
ordered["$skin"]=1
|
||||||
dir="$DANSER_SKINS_DIR/$skin"
|
dir="$DANSER_SKINS_DIR/$skin"
|
||||||
[ ! -d "$dir" ] && echo "Directory not found: $dir" && continue
|
[ ! -d "$dir" ] && echo "⚠️ Directory not found: $dir" && continue
|
||||||
ini_file=$(find "$dir" -maxdepth 1 -iname "skin.ini" | head -n1)
|
|
||||||
|
ini_file=$(find "$dir" -maxdepth 1 -iname "skin.ini" | head -n1 || true)
|
||||||
skin_header="$skin"
|
skin_header="$skin"
|
||||||
|
|
||||||
if [ -f "$ini_file" ]; then
|
if [ -f "$ini_file" ]; then
|
||||||
line=$(grep -i '^[[:space:]]*Name:' "$ini_file" | head -n1)
|
# Robust grep: match Name: even if no leading space, ignore encoding issues
|
||||||
|
line=$(grep -a -i '^Name[[:space:]]*:' "$ini_file" | head -n1 || true)
|
||||||
if [ -n "$line" ]; then
|
if [ -n "$line" ]; then
|
||||||
val="${line#*:}"
|
val="${line#*:}"
|
||||||
val="$(echo "$val" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
|
val="$(echo "$val" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
|
||||||
if [ -n "$val" ]; then
|
if [ -n "$val" ]; then
|
||||||
skin_header=$(sanitize_filename "$val")
|
skin_header=$(sanitize_filename "$val")
|
||||||
|
else
|
||||||
|
skin_header=$(sanitize_filename "$skin")
|
||||||
|
echo "⚠️ Warning: 'Name:' field empty in $skin. Falling back to folder name." >&2
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
skin_header=$(sanitize_filename "$skin")
|
||||||
|
echo "⚠️ Warning: No 'Name:' field found in $skin. Falling back to folder name." >&2
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo "⚠️ Warning: No skin.ini found for $skin. Skipping." >&2
|
||||||
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
raw_path="$(printf "%s/%s" "$skin" "$skin_header" | sed 's/^ *//;s/ *$//')"
|
raw_path="$(printf "%s/%s" "$skin" "$skin_header" | sed 's/^ *//;s/ *$//')"
|
||||||
@@ -710,15 +722,25 @@ jobs:
|
|||||||
|
|
||||||
ini_file=$(find "$dir" -maxdepth 1 -iname "skin.ini" | head -n1 || true)
|
ini_file=$(find "$dir" -maxdepth 1 -iname "skin.ini" | head -n1 || true)
|
||||||
skin_header="$skin"
|
skin_header="$skin"
|
||||||
|
|
||||||
if [ -f "$ini_file" ]; then
|
if [ -f "$ini_file" ]; then
|
||||||
line=$(grep -i '^[[:space:]]*Name:' "$ini_file" | head -n1 || true)
|
line=$(grep -a -i '^Name[[:space:]]*:' "$ini_file" | head -n1 || true)
|
||||||
if [ -n "$line" ]; then
|
if [ -n "$line" ]; then
|
||||||
val="${line#*:}"
|
val="${line#*:}"
|
||||||
val="$(echo "$val" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
|
val="$(echo "$val" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
|
||||||
if [ -n "$val" ]; then
|
if [ -n "$val" ]; then
|
||||||
skin_header=$(sanitize_filename "$val")
|
skin_header=$(sanitize_filename "$val")
|
||||||
|
else
|
||||||
|
skin_header=$(sanitize_filename "$skin")
|
||||||
|
echo "⚠️ Warning: 'Name:' field empty in $skin. Falling back to folder name." >&2
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
skin_header=$(sanitize_filename "$skin")
|
||||||
|
echo "⚠️ Warning: No 'Name:' field found in $skin. Falling back to folder name." >&2
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo "⚠️ Warning: No skin.ini found for $skin. Skipping." >&2
|
||||||
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
raw_path="$(printf "%s/%s" "$skin" "$skin_header" | sed 's/^ *//;s/ *$//')"
|
raw_path="$(printf "%s/%s" "$skin" "$skin_header" | sed 's/^ *//;s/ *$//')"
|
||||||
|
|||||||
Reference in New Issue
Block a user