Banner tweak (manual)

2026-01-03 21:36:04 -05:00
parent 899d043892
commit aa8788168e
8 changed files with 181 additions and 149 deletions
--- a/rpi/pull-image.sh
+++ b/rpi/pull-image.sh
@@ -3,9 +3,11 @@
 # Pull Stegasoo image from SD card
 # Auto-detects SD card, copies with progress, shrinks, and compresses
 #
-# Usage: ./pull-image.sh [output-name]
+# Usage: ./pull-image.sh [output-name] [device]
 #        Output will be: stegasoo-rpi-YYYYMMDD.img.zst (or custom name)
 #
+# If device is specified, skips auto-detection (useful for large drives)
+#

 set -e

@@ -30,12 +32,13 @@ if [ "$EUID" -ne 0 ]; then
    exit 1
 fi

-# Output filename
+# Output filename and optional device
 if [ -n "$1" ]; then
    OUTPUT="$1"
 else
    OUTPUT="stegasoo-rpi-$(date +%Y%m%d).img.zst"
 fi
+MANUAL_DEVICE="$2"

 # Remove .zst extension for intermediate file
 IMG_FILE="${OUTPUT%.zst}"
@@ -50,71 +53,87 @@ echo "║              Stegasoo SD Card Image Puller                    ║"
 echo "╚═══════════════════════════════════════════════════════════════╝"
 echo -e "${NC}"

-# Auto-detect SD card candidates
-# Looking for: USB/removable, 8-128GB, not mounted as root filesystem
-echo -e "${BOLD}Scanning for SD cards...${NC}"
-echo ""
-
-declare -a CANDIDATES
-declare -a CANDIDATE_INFO
-
-while IFS= read -r line; do
-    DEV=$(echo "$line" | awk '{print $1}')
-    SIZE=$(echo "$line" | awk '{print $2}')
-    TYPE=$(echo "$line" | awk '{print $3}')
-    TRAN=$(echo "$line" | awk '{print $4}')
-    MODEL=$(echo "$line" | awk '{print $5" "$6" "$7}' | xargs)
-
-    # Skip if it's the root filesystem
-    if mount | grep -q "^/dev/${DEV}[0-9]* on / "; then
-        continue
-    fi
-
-    # Skip if any partition is mounted as root
-    ROOT_DEV=$(mount | grep " on / " | awk '{print $1}' | sed 's/[0-9]*$//')
-    if [[ "/dev/$DEV" == "$ROOT_DEV" ]]; then
-        continue
-    fi
-
-    # Get size in bytes for reliable comparison
-    SIZE_BYTES=$(lsblk -b -d -o SIZE -n "/dev/$DEV" 2>/dev/null | tr -d ' ')
-    SIZE_GB_INT=$((SIZE_BYTES / 1073741824))  # 1024^3
-
-    # Check if size is in SD card range (8GB - 128GB)
-    if [ "$SIZE_GB_INT" -ge 8 ] && [ "$SIZE_GB_INT" -le 128 ]; then
-        CANDIDATES+=("/dev/$DEV")
-        CANDIDATE_INFO+=("$SIZE $TYPE ${TRAN:-???} $MODEL")
-    fi
-done < <(lsblk -d -o NAME,SIZE,TYPE,TRAN,MODEL -n | grep "disk")
-
-if [ ${#CANDIDATES[@]} -eq 0 ]; then
-    echo -e "${RED}No SD card candidates found.${NC}"
-    echo "Looking for USB/removable disks between 8GB and 128GB."
-    echo ""
-    echo "Available disks:"
-    lsblk -d -o NAME,SIZE,TYPE,TRAN,MODEL
-    exit 1
-fi
-
-echo -e "${GREEN}Found ${#CANDIDATES[@]} candidate(s):${NC}"
-echo ""
-
-for i in "${!CANDIDATES[@]}"; do
-    echo -e "  ${BOLD}[$((i+1))]${NC} ${CANDIDATES[$i]} - ${CANDIDATE_INFO[$i]}"
-done
-
-echo ""
-
-if [ ${#CANDIDATES[@]} -eq 1 ]; then
-    SELECTED="${CANDIDATES[0]}"
-    echo -e "Auto-selected: ${YELLOW}$SELECTED${NC}"
-else
-    read -p "Select device [1-${#CANDIDATES[@]}]: " -r
-    if [[ ! $REPLY =~ ^[0-9]+$ ]] || [ "$REPLY" -lt 1 ] || [ "$REPLY" -gt ${#CANDIDATES[@]} ]; then
-        echo -e "${RED}Invalid selection.${NC}"
+# Use manual device or auto-detect
+if [ -n "$MANUAL_DEVICE" ]; then
+    # Manual device specified
+    if [ ! -b "$MANUAL_DEVICE" ]; then
+        echo -e "${RED}Error: $MANUAL_DEVICE is not a block device${NC}"
        exit 1
    fi
-    SELECTED="${CANDIDATES[$((REPLY-1))]}"
+    SELECTED="$MANUAL_DEVICE"
+    echo -e "Using specified device: ${YELLOW}$SELECTED${NC}"
+    echo ""
+    lsblk "$SELECTED" -o NAME,SIZE,TYPE,MODEL
+    echo ""
+else
+    # Auto-detect SD card candidates
+    # Looking for: USB/removable, 8-128GB, not mounted as root filesystem
+    echo -e "${BOLD}Scanning for SD cards...${NC}"
+    echo ""
+
+    declare -a CANDIDATES
+    declare -a CANDIDATE_INFO
+
+    while IFS= read -r line; do
+        DEV=$(echo "$line" | awk '{print $1}')
+        SIZE=$(echo "$line" | awk '{print $2}')
+        TYPE=$(echo "$line" | awk '{print $3}')
+        TRAN=$(echo "$line" | awk '{print $4}')
+        MODEL=$(echo "$line" | awk '{print $5" "$6" "$7}' | xargs)
+
+        # Skip if it's the root filesystem
+        if mount | grep -q "^/dev/${DEV}[0-9]* on / "; then
+            continue
+        fi
+
+        # Skip if any partition is mounted as root
+        ROOT_DEV=$(mount | grep " on / " | awk '{print $1}' | sed 's/[0-9]*$//')
+        if [[ "/dev/$DEV" == "$ROOT_DEV" ]]; then
+            continue
+        fi
+
+        # Get size in bytes for reliable comparison
+        SIZE_BYTES=$(lsblk -b -d -o SIZE -n "/dev/$DEV" 2>/dev/null | tr -d ' ')
+        SIZE_GB_INT=$((SIZE_BYTES / 1073741824))  # 1024^3
+
+        # Check if size is in SD card range (8GB - 128GB)
+        if [ "$SIZE_GB_INT" -ge 8 ] && [ "$SIZE_GB_INT" -le 128 ]; then
+            CANDIDATES+=("/dev/$DEV")
+            CANDIDATE_INFO+=("$SIZE $TYPE ${TRAN:-???} $MODEL")
+        fi
+    done < <(lsblk -d -o NAME,SIZE,TYPE,TRAN,MODEL -n | grep "disk")
+
+    if [ ${#CANDIDATES[@]} -eq 0 ]; then
+        echo -e "${RED}No SD card candidates found.${NC}"
+        echo "Looking for USB/removable disks between 8GB and 128GB."
+        echo ""
+        echo "Available disks:"
+        lsblk -d -o NAME,SIZE,TYPE,TRAN,MODEL
+        echo ""
+        echo -e "${YELLOW}Tip: Specify device manually: $0 output.img.zst /dev/sdX${NC}"
+        exit 1
+    fi
+
+    echo -e "${GREEN}Found ${#CANDIDATES[@]} candidate(s):${NC}"
+    echo ""
+
+    for i in "${!CANDIDATES[@]}"; do
+        echo -e "  ${BOLD}[$((i+1))]${NC} ${CANDIDATES[$i]} - ${CANDIDATE_INFO[$i]}"
+    done
+
+    echo ""
+
+    if [ ${#CANDIDATES[@]} -eq 1 ]; then
+        SELECTED="${CANDIDATES[0]}"
+        echo -e "Auto-selected: ${YELLOW}$SELECTED${NC}"
+    else
+        read -p "Select device [1-${#CANDIDATES[@]}]: " -r
+        if [[ ! $REPLY =~ ^[0-9]+$ ]] || [ "$REPLY" -lt 1 ] || [ "$REPLY" -gt ${#CANDIDATES[@]} ]; then
+            echo -e "${RED}Invalid selection.${NC}"
+            exit 1
+        fi
+        SELECTED="${CANDIDATES[$((REPLY-1))]}"
+    fi
 fi

 # Show partitions