added icons and improved ux
This commit is contained in:
+20
-12
@@ -23,9 +23,16 @@ echo "--- $ICON_GEAR Setup ---"
|
||||
detect_hosts
|
||||
resolve_remote_ip
|
||||
|
||||
# Single connectivity check upfront — fail fast before attempting all shares
|
||||
# against an unreachable host rather than failing per-share through the loop
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# --- $ICON_SHIELD Pre-flight Checks ---
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo ""
|
||||
echo "--- $ICON_SHIELD Pre-flight Checks ---"
|
||||
|
||||
# Single connectivity and rootfs check upfront — fail fast before attempting all shares
|
||||
# Individual share and disk checks run per-share inside rsync.sh
|
||||
check_connectivity
|
||||
check_remote_rootfs
|
||||
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# Tracking
|
||||
@@ -41,7 +48,7 @@ SHARE_COUNT=${#DAILY_SYNC_SHARES[@]}
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo ""
|
||||
echo "--- $ICON_SYNC Daily Sync Starting — $(date '+%Y-%m-%d %H:%M:%S') ---"
|
||||
echo "Shares: $SHARE_COUNT"
|
||||
echo "$ICON_SUMMARY Shares: $SHARE_COUNT"
|
||||
echo ""
|
||||
|
||||
SHARE_INDEX=0
|
||||
@@ -57,6 +64,7 @@ for SHARE in "${DAILY_SYNC_SHARES[@]}"; do
|
||||
SHARE_END=$(date +%s)
|
||||
SHARE_TIMES+=("$SHARE_NAME:$((SHARE_END - SHARE_START))")
|
||||
PASS+=("$SHARE_NAME")
|
||||
echo "$ICON_DONE $SHARE_NAME complete"
|
||||
else
|
||||
SHARE_END=$(date +%s)
|
||||
SHARE_TIMES+=("$SHARE_NAME:$((SHARE_END - SHARE_START))")
|
||||
@@ -71,11 +79,11 @@ TOTAL_END=$(date +%s)
|
||||
TOTAL_DURATION=$((TOTAL_END - TOTAL_START))
|
||||
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# --- $ICON_SUCCESS Summary ---
|
||||
# --- $ICON_SUMMARY Summary ---
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo "===== DAILY SYNC SUMMARY ====="
|
||||
echo "Started: $(date -d @$TOTAL_START '+%Y-%m-%d %H:%M:%S')"
|
||||
echo "Finished: $(date -d @$TOTAL_END '+%Y-%m-%d %H:%M:%S')"
|
||||
echo "===== $ICON_SUMMARY DAILY SYNC SUMMARY ====="
|
||||
echo "$ICON_TIME Started: $(date -d @$TOTAL_START '+%Y-%m-%d %H:%M:%S')"
|
||||
echo "$ICON_TIME Finished: $(date -d @$TOTAL_END '+%Y-%m-%d %H:%M:%S')"
|
||||
echo ""
|
||||
for entry in "${SHARE_TIMES[@]}"; do
|
||||
SHARE_NAME="${entry%%:*}"
|
||||
@@ -83,14 +91,14 @@ for entry in "${SHARE_TIMES[@]}"; do
|
||||
if printf '%s\n' "${FAIL[@]}" | grep -qx "$SHARE_NAME"; then
|
||||
echo " $ICON_ERROR $SHARE_NAME — $(format_duration $DURATION)"
|
||||
else
|
||||
echo " $ICON_SUCCESS $SHARE_NAME — $(format_duration $DURATION)"
|
||||
echo " $ICON_DONE $SHARE_NAME — $(format_duration $DURATION)"
|
||||
fi
|
||||
done
|
||||
echo ""
|
||||
echo " Passed: ${#PASS[@]}/$SHARE_COUNT"
|
||||
echo " Failed: ${#FAIL[@]}/$SHARE_COUNT"
|
||||
echo " Duration: $(format_duration $TOTAL_DURATION)"
|
||||
echo "=============================="
|
||||
echo " $ICON_SUCCESS Passed: ${#PASS[@]}/$SHARE_COUNT"
|
||||
echo " $ICON_ERROR Failed: ${#FAIL[@]}/$SHARE_COUNT"
|
||||
echo " $ICON_TIME Duration: $(format_duration $TOTAL_DURATION)"
|
||||
echo "========================================="
|
||||
|
||||
[[ ${#FAIL[@]} -gt 0 ]] && exit 1
|
||||
exit 0
|
||||
Reference in New Issue
Block a user