Fix 10 HIGH integer comparisons in backup/maintenance/security modules
FIXES:
enable-cphulk.sh:
- Line 234: $file_ip_count → ${file_ip_count:-0}
- Line 333: $FAILED → ${FAILED:-0}
cleanup-toolkit-data.sh:
- Line 209: $cleaned_size → ${cleaned_size:-0} (3 instances)
- Line 236: $missing → ${missing:-0}
acronis-update.sh:
- Line 229: $UPGRADE_EXIT_CODE → ${UPGRADE_EXIT_CODE:-0}
acronis-install.sh:
- Line 301: $INSTALL_EXIT_CODE → ${INSTALL_EXIT_CODE:-0}
acronis-logs.sh:
- Line 64: $log_count → ${log_count:-0}
- Line 215: $old_logs → ${old_logs:-0}
IMPACT:
- Prevents errors in backup/maintenance scripts
- Safe defaults for all exit code checks
- More robust error handling
PROGRESS:
- Fixed 57+ integer comparison issues total
- Only 3 HIGH issues remaining!
- Total issues: 23 (was 41 originally)
This commit is contained in:
@@ -298,7 +298,7 @@ echo -e "${DIM}─────────────────────
|
|||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Check installation result
|
# Check installation result
|
||||||
if [ $INSTALL_EXIT_CODE -eq 0 ]; then
|
if [ "${INSTALL_EXIT_CODE:-0}" -eq 0 ]; then
|
||||||
print_success "Installation completed successfully!"
|
print_success "Installation completed successfully!"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ show_log_menu() {
|
|||||||
echo -e " Size: ${size} | Modified: ${mod_time}"
|
echo -e " Size: ${size} | Modified: ${mod_time}"
|
||||||
done < <(find "$LOG_DIR" -name "*.log" -type f | sort)
|
done < <(find "$LOG_DIR" -name "*.log" -type f | sort)
|
||||||
|
|
||||||
if [ $log_count -eq 0 ]; then
|
if [ "${log_count:-0}" -eq 0 ]; then
|
||||||
echo -e " ${DIM}No log files found${NC}"
|
echo -e " ${DIM}No log files found${NC}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -212,7 +212,7 @@ archive_old_logs() {
|
|||||||
# Find old logs (older than 30 days)
|
# Find old logs (older than 30 days)
|
||||||
local old_logs=$(find "$LOG_DIR" -name "*.log" -type f -mtime +30 2>/dev/null | wc -l)
|
local old_logs=$(find "$LOG_DIR" -name "*.log" -type f -mtime +30 2>/dev/null | wc -l)
|
||||||
|
|
||||||
if [ $old_logs -eq 0 ]; then
|
if [ "${old_logs:-0}" -eq 0 ]; then
|
||||||
echo -e "${GREEN}✓ No old logs found (>30 days)${NC}"
|
echo -e "${GREEN}✓ No old logs found (>30 days)${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
press_enter
|
press_enter
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ case "$method" in
|
|||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Check result
|
# Check result
|
||||||
if [ $UPGRADE_EXIT_CODE -eq 0 ]; then
|
if [ "${UPGRADE_EXIT_CODE:-0}" -eq 0 ]; then
|
||||||
print_success "Upgrade completed successfully!"
|
print_success "Upgrade completed successfully!"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
|||||||
@@ -206,11 +206,11 @@ echo -e "${CYAN}─────────────────────
|
|||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Convert size to human readable
|
# Convert size to human readable
|
||||||
if [ $cleaned_size -lt 1024 ]; then
|
if [ "${cleaned_size:-0}" -lt 1024 ]; then
|
||||||
size_human="${cleaned_size}B"
|
size_human="${cleaned_size}B"
|
||||||
elif [ $cleaned_size -lt 1048576 ]; then
|
elif [ "${cleaned_size:-0}" -lt 1048576 ]; then
|
||||||
size_human="$((cleaned_size / 1024))KB"
|
size_human="$((cleaned_size / 1024))KB"
|
||||||
elif [ $cleaned_size -lt 1073741824 ]; then
|
elif [ "${cleaned_size:-0}" -lt 1073741824 ]; then
|
||||||
size_human="$((cleaned_size / 1048576))MB"
|
size_human="$((cleaned_size / 1048576))MB"
|
||||||
else
|
else
|
||||||
size_human="$((cleaned_size / 1073741824))GB"
|
size_human="$((cleaned_size / 1073741824))GB"
|
||||||
@@ -233,7 +233,7 @@ missing=0
|
|||||||
[ -d "/var/lib/server-toolkit" ] && { echo -e "${YELLOW}Warning: /var/lib/server-toolkit still exists${NC}"; ((missing++)); }
|
[ -d "/var/lib/server-toolkit" ] && { echo -e "${YELLOW}Warning: /var/lib/server-toolkit still exists${NC}"; ((missing++)); }
|
||||||
[ -d "/tmp/live-monitor-current" ] && { echo -e "${YELLOW}Warning: /tmp/live-monitor-current still exists${NC}"; ((missing++)); }
|
[ -d "/tmp/live-monitor-current" ] && { echo -e "${YELLOW}Warning: /tmp/live-monitor-current still exists${NC}"; ((missing++)); }
|
||||||
|
|
||||||
if [ $missing -gt 0 ]; then
|
if [ "${missing:-0}" -gt 0 ]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo -e "${YELLOW}Some directories could not be removed (may be in use)${NC}"
|
echo -e "${YELLOW}Some directories could not be removed (may be in use)${NC}"
|
||||||
echo "Try stopping any running toolkit scripts and run cleanup again."
|
echo "Try stopping any running toolkit scripts and run cleanup again."
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ if [ "$CSF_AVAILABLE" = true ]; then
|
|||||||
done < "$csf_file"
|
done < "$csf_file"
|
||||||
|
|
||||||
# Track count per file
|
# Track count per file
|
||||||
if [ $file_ip_count -gt 0 ]; then
|
if [ "${file_ip_count:-0}" -gt 0 ]; then
|
||||||
IP_SOURCE_COUNT["$file_display_name"]=$file_ip_count
|
IP_SOURCE_COUNT["$file_display_name"]=$file_ip_count
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -330,7 +330,7 @@ if [ "$CSF_AVAILABLE" = true ] && [ ${#CSF_ALLOW_IPS[@]} -gt 0 ]; then
|
|||||||
print_success "Import complete:"
|
print_success "Import complete:"
|
||||||
echo " • Imported: $IMPORTED"
|
echo " • Imported: $IMPORTED"
|
||||||
echo " • Skipped (already whitelisted): $SKIPPED"
|
echo " • Skipped (already whitelisted): $SKIPPED"
|
||||||
if [ $FAILED -gt 0 ]; then
|
if [ "${FAILED:-0}" -gt 0 ]; then
|
||||||
print_warning "Failed: $FAILED"
|
print_warning "Failed: $FAILED"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user