Use redi_url instead of direct image

Author: igorpecovnik

tools/include/images/FLASH1.png

@@ -1 +1,7 @@
-This module provides a simple way to download and flash any Armbian OS image from our servers. It lets you prepare a bootable SD card or, when running from live media, flash a fresh OS directly onto the device’s internal storage. All flashed images are automatically verified to ensure data integrity and reliable installation.
+What can this tool do?
+
+- Install Armbian onto internal **eMMC, SSD, or other storage**
+- Create **bootable SD cards or USB drives** for any supported board
+- Recover a system by **re-flashing a clean image**
+- Switch between different **OS variants, kernel branches, or preinstalled applications**
+- Accelerate development with **fast, repeatable deployments** for testing and automation

tools/include/markdown/FLASH1-footer.md

@@ -1 +1,5 @@
-This section provides an option to transfer the live running Armbian system from an SD card to internal storage devices such as eMMC, SATA, NVMe, or USB drives. It prepares the target storage, copies the active system, adjusts bootloader settings, and ensures the system can boot independently without requiring reinstallation.
+- Clones your current live OS installation
+- Keeps your settings, configuration, installed packages, and user data
+- Essentially “transfer my existing system to internal/external storage”
+
+Use this option to **transfer your current live Armbian system** to another storage device (eMMC, SSD, USB, etc.).  This copies your existing installation exactly as it is — including settings, installed packages, and user data.

tools/include/markdown/FLASH1-header.md

@@ -91,7 +91,7 @@
                     "sub": [
                         {
                             "id": "STO001",
-                            "description": "Copy live OS to internal media",
+                            "description": "Copy the running Armbian system to another device",
                             "short": "Install",
                             "module": "module_generic",
                             "command": [
@@ -103,7 +103,7 @@
                         },
                         {
                             "id": "FLASH1",
-                            "description": "Download and flash to internal media",
+                            "description": "Download a fresh, official Armbian OS image and write it to a device",
                             "short": "Download and flash",
                             "module": "module_images",
                             "command": [

tools/include/markdown/STO001-header.md

@@ -8,7 +8,7 @@ module_options+=(
 	["module_images,example"]="install remove purge status help"
 	["module_images,desc"]="Download and flash Armbian OS images for selected hardware"
 	["module_images,status"]="Active"
-	["module_images,doc_link"]="https://docs.armbian.com/User-Guide_Recovery/"
+	["module_images,doc_link"]=""
 	["module_images,group"]="Management"
 	["module_images,arch"]="x86-64 arm64 armhf"
 )
@@ -775,62 +775,47 @@ function module_images () {
 	}
 
 	# Helper: download image file
-	# We only have .img.xz: download and decompress on the fly to .img
+	# Download is always done using file_url (full path)
+	# redi_url is only shown to the user as a clean short link
 	download_image_file() {
-		local file_url file_ext image_url filename dirname base real_image_ext
+		local file_url redi_url file_ext image_url filename dirname raw_filename
 
+		# Always download using file_url
 		file_url=$(jq -r '.file_url' <<< "$IMAGE_JSON")
+		redi_url=$(jq -r '.redi_url // ""' <<< "$IMAGE_JSON")
 		file_ext=$(jq -r '.file_extension // ""' <<< "$IMAGE_JSON")
 
-		# Derive real image extension and URL
-		if [[ -n "$file_ext" && "$file_ext" == img.xz ]]; then
-			# JSON already tells us it's img.xz
-			image_url="$file_url"
-		else
-			# Fallback: strip known non-image tails from URL if needed
-			case "$file_url" in
-				*.img.xz)
-					image_url="$file_url"
-					;;
-				*.asc|*.torrent|*.sha*)
-					image_url="${file_url%.*}"
-					;;
-				*)
-					image_url="$file_url"
-					;;
-			esac
-		fi
+		# Determine real downloadable URL (must be file_url)
+		case "$file_url" in
+			*.img.xz)  image_url="$file_url" ;;
+			*.asc|*.torrent|*.sha*) image_url="${file_url%.*}" ;;
+			*) image_url="$file_url" ;;
+		esac
 
-		filename=$(basename "$image_url")        # e.g. Armbian_xxx_Board.img.xz
-		dirname=${image_url%/*}
+		filename=$(basename "$image_url")
+		raw_filename="${filename%.xz}"
 
-		# We want a local UNCOMPRESSED .img
-		local raw_filename="${filename%.xz}"     # strip .xz → .img
 		LOCAL_IMAGE_PATH="${IMAGES_BASE}/${raw_filename}"
 
-		# If already present, optionally reuse
+		# If already present, ask reuse
 		if [[ -f "$LOCAL_IMAGE_PATH" ]]; then
 			if [[ -n "$DIALOG" ]]; then
-				if $DIALOG --title "Image already available" --yesno \
-					"Uncompressed image already exists:\n\n$LOCAL_IMAGE_PATH\n\nReuse this file?" 12 70; then
-					return 0
-				fi
+				$DIALOG --title "Note" --yesno \
+					"\nUncompressed image already exists in ${IMAGES_BASE}/:\n\n${raw_filename}\n\nReuse this file?" \
+					12 70 && return 0
 			else
 				read -rp "Image $LOCAL_IMAGE_PATH exists. Reuse? [y/N]: " reuse
-				if [[ "$reuse" =~ ^[Yy]$ ]]; then
-					return 0
-				fi
+				[[ "$reuse" =~ ^[Yy]$ ]] && return 0
 			fi
-			# If user does not want to reuse, remove the old file
 			rm -f "$LOCAL_IMAGE_PATH"
 		fi
 
-		# Size of the COMPRESSED file (for pv/gauge)
+		# File size for pv gauge
 		local content_length
 		content_length=$(jq -r '(.file_size // "0")' <<< "$IMAGE_JSON")
 		[[ -z "$content_length" ]] && content_length=0
 
-		# Ensure xz exists
+		# Must have xz
 		if ! command -v xz >/dev/null 2>&1; then
 			echo "xz is required to decompress the image."
 			return 1
@@ -839,54 +824,56 @@ function module_images () {
 		# -------------------------
 		# Download + decompress
 		# -------------------------
+		local display_url="$redi_url"
+		[[ -z "$display_url" ]] && display_url="$image_url"
+
 		local rc=0
 
-		if command -v pv >/dev/null 2>&1 && [[ -n "$DIALOG" ]] && [[ "$content_length" =~ ^[0-9]+$ ]] && (( content_length > 0 )); then
-			# Use whiptail gauge driven by pv (on COMPRESSED size)
-			local gauge_fifo
-			gauge_fifo=$(mktemp -u)
-			mkfifo "$gauge_fifo"
+		if command -v pv >/dev/null 2>&1 && [[ -n "$DIALOG" ]] && (( content_length > 0 )); then
+			local gauge_dir
+			gauge_dir=$(mktemp -d) || { echo "Failed to create temp dir"; return 1; }
+			local gauge_fifo="${gauge_dir}/fifo"
+			mkfifo "$gauge_fifo" || { rm -rf "$gauge_dir"; return 1; }
 
-			"$DIALOG" --title "Armbian imager" \
-				--gauge "Downloading and decompressing Armbian image...\n\n$image_url" 10 70 0 \
-				< "$gauge_fifo" &
+			$DIALOG --title "Armbian imager" \
+				--gauge "\nDownloading and decompressing Armbian image...\n\n$display_url" \
+				10 70 0 < "$gauge_fifo" &
 			local gauge_pid=$!
 
-			# curl (compressed) → pv (0..100 based on compressed size) → xz -dc → .img
-			if ! curl -fSL "$image_url" 2>/dev/null \
-				| pv -n -s "$content_length" 2> "$gauge_fifo" \
-				| xz -T0 -dc \
-				> "$LOCAL_IMAGE_PATH"; then
-				rc=$?
-			else
-				rc=0
-			fi
+			{
+				curl -fSL "$image_url" 2>/dev/null \
+					| pv -n -s "$content_length" 2> "$gauge_fifo" \
+					| xz -T0 -dc \
+					> "$LOCAL_IMAGE_PATH"
+			} || rc=$?
 
-			# Close FIFO & wait gauge
-			exec 3>&-
 			rm -f "$gauge_fifo"
+			rmdir "$gauge_dir" 2>/dev/null || true
 			wait "$gauge_pid" 2>/dev/null || true
 
-			if [[ $rc -ne 0 ]]; then
+			(( rc != 0 )) && {
 				echo "Failed to download or decompress image: $image_url"
 				rm -f "$LOCAL_IMAGE_PATH"
 				return 1
-			fi
+			}
+
 		else
-			# Fallback: no pv or no DIALOG or no size → plain stream
+			# Fallback simple mode
 			if [[ -n "$DIALOG" ]]; then
-				"$DIALOG" --infobox "Downloading and decompressing Armbian image...\n\n$image_url" 8 70
+				$DIALOG --infobox \
+					"\nDownloading and decompressing Armbian image...\n\n$display_url" \
+					8 70
 			else
-				echo "Downloading and decompressing image from $image_url ..."
+				echo "Downloading and decompressing: $display_url"
 			fi
 
-			if ! curl -fSL "$image_url" \
+			curl -fSL "$image_url" \
 				| xz -T0 -dc \
-				> "$LOCAL_IMAGE_PATH"; then
-				echo "Failed to download or decompress image: $image_url"
-				rm -f "$LOCAL_IMAGE_PATH"
-				return 1
-			fi
+				> "$LOCAL_IMAGE_PATH" || {
+					echo "Failed to download or decompress: $image_url"
+					rm -f "$LOCAL_IMAGE_PATH"
+					return 1
+				}
 		fi
 
 		return 0
@@ -922,9 +909,10 @@ function module_images () {
 		# FLASH PHASE (with gauge if pv + $DIALOG available)
 		# ------------------------------------------------------------
 		if command -v pv >/dev/null 2>&1 && [[ -n "$DIALOG" ]]; then
-			local gauge_fifo
-			gauge_fifo=$(mktemp -u)
-			mkfifo "$gauge_fifo"
+			local gauge_dir
+			gauge_dir=$(mktemp -d) || { echo "Failed to create temp dir"; return 1; }
+			local gauge_fifo="${gauge_dir}/fifo"
+			mkfifo "$gauge_fifo" || { rm -rf "$gauge_dir"; return 1; }
 
 			# Reader: takes percentages from FIFO and feeds whiptail
 			{
@@ -943,6 +931,7 @@ function module_images () {
 
 			# Close FIFO and wait for whiptail to exit
 			rm -f "$gauge_fifo"
+			rmdir "$gauge_dir" 2>/dev/null || true
 			wait "$gauge_pid" 2>/dev/null || true
 		else
 			# Fallback: console progress
@@ -974,14 +963,14 @@ function module_images () {
 
 			if command -v pv >/dev/null 2>&1 && [[ -n "$DIALOG" ]]; then
 				# Gauge for verification
-				local v_fifo
-				v_fifo=$(mktemp -u)
-				mkfifo "$v_fifo"
-
+				local gauge_dir
+				gauge_dir=$(mktemp -d) || { echo "Failed to create temp dir"; return 1; }
+				local gauge_fifo="${gauge_dir}/fifo"
+				mkfifo "$gauge_fifo" || { rm -rf "$gauge_dir"; return 1; }
 				{
 					while read -r line; do
 						echo "$line"
-					done < "$v_fifo"
+					done < "$gauge_fifo"
 				} | "$DIALOG" --title "Armbian imager" \
 					--gauge "\nVerifying written image on $dev...\n\nPlease wait." 10 70 0 &
 				local v_pid=$!
@@ -990,11 +979,12 @@ function module_images () {
 				verify_result=1
 				{
 					dd if="$dev" bs=$block_size count=$blocks status=none \
-						| pv -n -s "$img_size_bytes" 2> "$v_fifo" \
+						| pv -n -s "$img_size_bytes" 2> "$gauge_fifo" \
 						| cmp -n "$img_size_bytes" "$img" - >/dev/null
 				} || verify_result=0
 
-				rm -f "$v_fifo"
+				rm -f "$gauge_fifo"
+				rmdir "$gauge_dir" 2>/dev/null || true
 				wait "$v_pid" 2>/dev/null || true
 			else
 				# No gauge, but still verify