Fixing comments

Author: tsj-30

samples/convert-upload-images-powervs/convert-upload-images-powervs

@@ -643,77 +643,69 @@ function download_url() {
   validate_url "$url"
 
   # Remove any existing file
-  rm -rf "$image_name"
-  
-  # Retry loop
+  rm -f "$image_name"
+
+  # Retry loop: focus purely on download
   while [ $retry_count -lt $DOWNLOAD_MAX_RETRIES ]; do
     if [ $retry_count -gt 0 ]; then
       warn "Retry attempt $retry_count of $DOWNLOAD_MAX_RETRIES"
       sleep $DOWNLOAD_RETRY_DELAY
     else
       log "Download attempt $((retry_count + 1)) of $DOWNLOAD_MAX_RETRIES"
     fi
-    
-    # Download with timeout and progress
+
     log "Downloading $(basename "$image_name")..."
-    if curl -fLSs --retry 2 --retry-delay 2 --connect-timeout 60 --max-time $DOWNLOAD_TIMEOUT "$url" -o "./$image_name" 2>&1; then
-      
-      # Verify file exists and has content
-      if [ ! -f "./$image_name" ] || [ ! -s "./$image_name" ]; then
-        error "Downloaded file is missing or empty"
-        retry_count=$((retry_count + 1))
-        continue
-      fi
-      
-      log "Download completed, verifying integrity..."
-      
-      # Verify file size
-      if ! verify_file_size "./$image_name" "$url"; then
-        warn "File size verification failed, retrying..."
-        rm -f "./$image_name"
-        retry_count=$((retry_count + 1))
-        continue
-      fi
-      
-      # Verify SHA256 checksum
-      if ! verify_sha256 "./$image_name" "$expected_sha256"; then
-        error "Checksum verification failed, retrying..."
-        rm -f "./$image_name"
-        retry_count=$((retry_count + 1))
-        continue
-      fi
-      
-      # All verifications passed
-      IMAGE_PATH="./$image_name"
-      DOWNLOAD_IMAGE_NAME="$image_name"
+    if curl -fLSs --retry 2 --retry-delay 2 --connect-timeout 60 \
+      --max-time $DOWNLOAD_TIMEOUT "$url" -o "./$image_name" 2>&1; then
       download_success=true
-      
-      success "========================================="
-      success "✓ Download and verification completed successfully!"
-      success "  File: $(basename "$image_name")"
-      success "  Location: $IMAGE_PATH"
-      success "========================================="
-      return 0
+      break
     else
       local curl_exit=$?
-      error "Download failed with curl error code: $curl_exit"
-      
-      # Provide specific error messages for common curl exit codes
+      error "Download failed (curl exit code: $curl_exit)"
       case $curl_exit in
-        1) error "  Reason: Could not resolve host (DNS failure)" ;;
-        2) error "  Reason: Failed to connect to host" ;;
-        3) error "  Reason: Partial file transfer" ;;
-        4) error "  Reason: HTTP error (404, 403, etc.)" ;;
-        5) error "  Reason: Operation timeout" ;;
-        6) error "  Reason: SSL connection error" ;;
-        *) error "  Reason: See curl manual for error code $curl_exit" ;;
+        1) error "  Could not resolve host (DNS failure)" ;;
+        2) error "  Failed to connect to host" ;;
+        3) error "  Partial file transfer" ;;
+        4) error "  HTTP error (404/403/etc.)" ;;
+        5) error "  Operation timeout" ;;
+        6) error "  SSL connection error" ;;
+        *) error "  See curl manual for exit code $curl_exit" ;;
       esac
-      
       rm -f "./$image_name"
       retry_count=$((retry_count + 1))
     fi
   done
-  
+
+  # Verify file existence and content after all download attempts
+  if [ ! -f "./$image_name" ] || [ ! -s "./$image_name" ]; then
+    error "Downloaded file is missing or empty after $DOWNLOAD_MAX_RETRIES attempts."
+    return 1
+  fi
+
+  # Perform verification once, after successful download
+  log "Download completed — running one-time verification checks..."
+
+  if ! verify_file_size "./$image_name" "$url"; then
+    warn "File size verification failed; please verify manually."
+  fi
+
+  if ! verify_sha256 "./$image_name" "$expected_sha256"; then
+    error "Checksum verification failed; downloaded file may be corrupted."
+    return 1
+  fi
+
+  IMAGE_PATH="./$image_name"
+  DOWNLOAD_IMAGE_NAME="$image_name"
+
+  success "========================================="
+  success "✓ Download and verification completed successfully!"
+  success "  File: $(basename "$image_name")"
+  success "  Location: $IMAGE_PATH"
+  success "========================================="
+  return 0
+}
+
+
   # All retries failed
   if [ "$download_success" = false ]; then
     error "========================================="