Dew-OF-Aurora 1 week ago
parent
commit
2820196ab3
2 changed files with 9 additions and 14 deletions
  1. 3 3
      scripts/install_debian.sh
  2. 6 11
      scripts/run_update_and_commit.sh

+ 3 - 3
scripts/install_debian.sh

@@ -312,11 +312,11 @@ fi
 to_minutes() {
 	local val="$1"
 	if [[ "$val" =~ ^([0-9]+)min$ ]] || [[ "$val" =~ ^([0-9]+)m$ ]]; then
-		echo "${BASH_REMATCH[1]}"
+		echo $((10#${BASH_REMATCH[1]}))
 	elif [[ "$val" =~ ^([0-9]+)h$ ]]; then
-		echo $(( ${BASH_REMATCH[1]} * 60 ))
+		echo $((10#${BASH_REMATCH[1]} * 60))
 	elif [[ "$val" =~ ^[0-9]+$ ]]; then
-		echo "$val"
+		echo $((10#$val))
 	else
 		echo ""
 	fi

+ 6 - 11
scripts/run_update_and_commit.sh

@@ -35,20 +35,15 @@ CONFIG_PATH="${1:-${APP_DIR}/config.server.json}"
 
 # --- adaptive interval check ---
 if [[ "$force_commit" != "1" ]]; then
-  peak_start="${PEAK_START_HOUR:-19}"
-  peak_end="${PEAK_END_HOUR:-24}"
+  peak_start=$((10#${PEAK_START_HOUR:-19}))
+  peak_end=$((10#${PEAK_END_HOUR:-24}))
   peak_tz="${PEAK_TZ:-Asia/Shanghai}"
-  peak_int="${PEAK_INTERVAL_MIN:-10}"
-  offpeak_int="${OFFPEAK_INTERVAL_MIN:-30}"
+  peak_int=$((10#${PEAK_INTERVAL_MIN:-10}))
+  offpeak_int=$((10#${OFFPEAK_INTERVAL_MIN:-30}))
 
   # Get current hour and minute in peak timezone
-  curr_hour=$(TZ="$peak_tz" date '+%H' | sed 's/^0//')
-  curr_hour=${curr_hour:-0}
-  curr_min=$(TZ="$peak_tz" date '+%M' | sed 's/^0//')
-  curr_min=${curr_min:-0}
-
-  # Normalize peak_end=24 to 0 (both mean "end of day / midnight")
-  [[ "$peak_end" -eq 24 ]] && peak_end=0
+  curr_hour=$((10#$(TZ="$peak_tz" date '+%H')))
+  curr_min=$((10#$(TZ="$peak_tz" date '+%M')))
 
   in_peak=0
   if [[ "$peak_start" -eq "$peak_end" ]]; then