Cleanup var declarations

openwrtbuilder

@@ -1,18 +1,13 @@
 #!/usr/bin/env bash
-#
-# Copyright 2022-23 Bryan C. Roessler
-#
-# Build and deploy OpenWRT images
-#
+# Builds and deploys OpenWRT images
+# Copyright 2022-24 Bryan C. Roessler
 # Apache 2.0 License
-#
 # See README.md and ./profiles
-#
 
 # Set default release
-: "${RELEASE:="23.05.3"}"
+: "${RELEASE:="23.05.5"}"
 
-printHelp() {
+print_help() {
   debug "${FUNCNAME[0]}"
 
   cat <<-'EOF'
@@ -49,10 +44,8 @@ printHelp() {
 	EOF
 }
 
-
 init() {
   debug "${FUNCNAME[0]}"
-
   declare -g ID RPM_MGR SCRIPTDIR DL_TOOL
 
   ((DEBUG)) || echo "To enable debugging output, use --debug or -d"
@@ -66,7 +59,7 @@ init() {
   else
     echo "/etc/os-release not found"
     echo "Your OS is unsupported"
-        printHelp
+    print_help
     exit 1
   fi
 
@@ -74,27 +67,18 @@ init() {
 
   # normalize distro ID
   case "$ID" in
-        debian|arch)
-            ;;
+    debian|arch) ;;
     centos|fedora)
-            if hash dnf &>/dev/null; then
+      if command -v dnf &>/dev/null; then
         RPM_MGR="dnf"
-            elif hash yum &>/dev/null; then
+      elif command -v yum &>/dev/null; then
         RPM_MGR="yum"
       fi
       ;;
-        rhel)
-            ID="centos"
-            ;;
-        linuxmint|neon|*ubuntu*)
-            ID="ubuntu"
-            ;;
-        *suse*)
-            ID="suse"
-            ;;
-        raspbian)
-            ID="debian"
-            ;;
+    rhel) ID="centos" ;;
+    linuxmint|neon|*ubuntu*) ID="ubuntu" ;;
+    *suse*) ID="suse" ;;
+    raspbian) ID="debian" ;;
     *)
       echo "Autodetecting distro, this may be unreliable"
       if hash dnf &>/dev/null; then
@@ -117,23 +101,15 @@ init() {
 
   # Set distro-specific functions
   case "$ID" in
-        fedora|centos)
-            pkg_install(){ sudo "$RPM_MGR" install -y "$@"; }
-            ;;
-        debian|ubuntu)
-            pkg_install(){ sudo apt-get install -y -q0 "$@"; }
-            ;;
-        suse)
-            pkg_install(){ sudo zypper --non-interactive -q install --force --no-confirm "$@"; }
-            ;;
-        arch)
-            pkg_install(){ sudo pacman -S --noconfirm --needed "$@"; }
-            ;;
+    fedora|centos) pkg_install(){ sudo "$RPM_MGR" install -y "$@"; } ;;
+    debian|ubuntu) pkg_install(){ sudo apt-get install -y -q0 "$@"; } ;;
+    suse) pkg_install(){ sudo zypper --non-interactive -q install --force --no-confirm "$@"; } ;;
+    arch) pkg_install(){ sudo pacman -S --noconfirm --needed "$@"; } ;;
   esac
 
-    if hash axel &>/dev/null; then
+  if command -v axel &>/dev/null; then
     DL_TOOL="axel"
-    elif hash curl &>/dev/null; then
+  elif command -v curl &>/dev/null; then
     DL_TOOL="curl"
   else
     echo "Downloading the Image Builder requires axel or curl"
@@ -141,54 +117,27 @@ init() {
   fi
 }
 
-
-readInput() {
-    debug "${FUNCNAME[0]}"
-
-    unset RESET YES
-
+parse_input() {
+  debug "${FUNCNAME[0]}" "$*"
   declare -ga PROFILES
-    declare long_opts='release:,version:,profile:,buildroot:,source,'
+  local long_opts='release:,version:,profile:,buildroot:,source,'
   long_opts+='ssh-upgrade:,ssh-backup:,flash:,reset,yes,debug,help'
 
   if _input=$(getopt -o +r:v:p:b:sf:ydh -l $long_opts -- "$@"); then
     eval set -- "$_input"
     while true; do
       case "$1" in
-                --release|-r|--version|-v)
-                    shift && declare -g USER_RELEASE="$1"
-                    ;;
-                --profile|-p)
-                    shift && PROFILES+=("$1")
-                    ;;
-                --buildroot|-b)
-                    shift && BUILDROOT="$1"
-                    ;;
-                --source|-s)
-                    FROM_SOURCE=1
-                    ;;
-                --ssh-upgrade)
-                    shift && SSH_UPGRADE_PATH="$1"
-                    ;;
-                --ssh-backup)
-                    shift && SSH_BACKUP_PATH="$1"
-                    ;;
-                --flash|-f)
-                    shift && FLASH_DEV="$1"
-                    ;;
-                --reset)
-                    RESET=1
-                    ;;
-                --yes|-y)
-                    YES=1
-                    ;;
-                --debug|-d)
-                    echo "Debugging on"
-                    DEBUG=1
-                    ;;
-                --help|-h)
-                    printHelp && exit 0
-                    ;;
+        --release|-r|--version|-v) shift; declare -g USER_RELEASE="$1" ;;
+        --profile|-p) shift; PROFILES+=("$1") ;;
+        --buildroot|-b) shift; BUILDROOT="$1" ;;
+        --source|-s) FROM_SOURCE=1 ;;
+        --ssh-upgrade) shift; SSH_UPGRADE_PATH="$1" ;;
+        --ssh-backup) shift; SSH_BACKUP_PATH="$1" ;;
+        --flash|-f) shift; FLASH_DEV="$1" ;;
+        --reset) RESET=1 ;;
+        --yes|-y) YES=1 ;;
+        --debug|-d) echo "Debugging on"; DEBUG=1 ;;
+        --help|-h) print_help; exit 0 ;;
         --)
           shift
           break
@@ -198,16 +147,14 @@ readInput() {
     done
   else
     echo "Incorrect options provided"
-        printHelp && exit 1
+    print_help; exit 1
   fi
 }
 
-
-installDependencies() {
+install_dependencies() {
   debug "${FUNCNAME[0]}"
-
-    declare -a pkg_list
-    declare lock_file="$BUILDROOT/.dependencies"
+  local lock_file="$BUILDROOT/.dependencies"
+  local -a pkg_list
 
   # TODO please contribute your platform here
   if ((FROM_SOURCE)); then
@@ -246,7 +193,7 @@ installDependencies() {
           "swig"
           "clang" # for qosify
           "llvm15-libs"
-                )
+          "patch")
         ;;
       debian|ubuntu)
         pkg_list+=(
@@ -266,7 +213,7 @@ installDependencies() {
           "zlib1g-dev"
           "file"
           "wget"
-                )
+          "patch")
         ;;
       arch)
         pkg_list+=(
@@ -308,7 +255,7 @@ installDependencies() {
           "wget"
           "which"
           "zlib"
-                )
+          "patch")
         ;;
       *)
         debug "Skipping dependency install, your OS is unsupported"
@@ -333,8 +280,7 @@ installDependencies() {
           "python3"
           "python2"
           "axel"
-                    "perl-IPC-Cmd"
-                )
+          "perl-IPC-Cmd")
         ;;
       debian|ubuntu)
         pkg_list+=(
@@ -350,8 +296,7 @@ installDependencies() {
           "wget"
           "unzip"
           "python"
-                    "axel"
-                )
+          "axel")
         ;;
       *)
         debug "Skipping dependency install, your OS is unsupported"
@@ -364,44 +309,31 @@ installDependencies() {
   [[ -f $lock_file ]] && return
     
   pkg_install "${pkg_list[@]}" && echo "${pkg_list[@]}" > "$lock_file"
-    
 }
 
+get_imagebuilder() {
+  debug "${FUNCNAME[0]}" "$*"
   
-getImageBuilder() {
-    debug "${FUNCNAME[0]}"
+  local -a url_file_pairs=("$@")
 
-    declare url="$1"
+  for ((i=0; i<${#url_file_pairs[@]}; i+=2)); do
+    local url="${url_file_pairs[i]}"
+    local file="${url_file_pairs[i+1]}"
 
-    if [[ -f "$IB_ARCHIVE" ]]; then
-        if askOk "$IB_ARCHIVE exists. Re-download?"; then
-            execute rm -f "$IB_ARCHIVE"
-        else
-            return 0
-        fi
+    # Check if file exists and ask user to remove and redownload
+    if [[ -f $file ]] && ! ask_ok "Use existing $file?"; then
+      execute rm -f "$file"
     fi
 
-    echo "Downloading Image Builder archive using $DL_TOOL"
-    execute "$DL_TOOL" "-o" "$IB_ARCHIVE" "$url"
+    # Download the file if it doesn't exist
+    if [[ ! -f "$file" ]]; then
+      echo "Downloading $url to $file using $DL_TOOL"
+      execute "$DL_TOOL" "-o" "$file" "$url"
+    fi
+  done
 }
 
-
-getImageBuilderChecksum() {
-    debug "${FUNCNAME[0]}"
-
-    if [[ -f $IB_SHA256_FILE ]]; then
-        if askOk "$IB_SHA256_FILE exists. Re-download?"; then
-            execute rm -f "$IB_SHA256_FILE"
-        else
-            return 0
-        fi
-    fi
-
-    execute "$DL_TOOL -o $IB_SHA256_FILE $IB_SHA256_URL"
-}
-
-
-addRepos() {
+add_repos() {
   debug "${FUNCNAME[0]}"
 
   if [[ -v P_ARR[repo] ]]; then
@@ -412,18 +344,15 @@ addRepos() {
   fi
 }
 
-
-sshBackup() {
+ssh_backup() {
   debug "${FUNCNAME[0]}"
-
-    declare date hostname backup_fname
-
-    [[ -d "$FILESDIR" ]] || mkdir -p "$FILESDIR"
-
+  local date hostname backup_fname
   printf -v date '%(%Y-%m-%d-%H-%M-%S)T'
   hostname=$(ssh -qt "$SSH_BACKUP_PATH" echo -n \$HOSTNAME)
   backup_fname="backup-$hostname-$date.tar.gz"
 
+  [[ -d "$FILESDIR" ]] || execute mkdir -p "$FILESDIR"
+
   # Make backup archive on remote
   if ! execute "ssh -t $SSH_BACKUP_PATH sysupgrade -b /tmp/$backup_fname"; then
     echo "SSH backup failed"
@@ -445,19 +374,23 @@ sshBackup() {
   execute "rm $BUILDDIR/$backup_fname"
 }
 
-
-makeImages() {
+make_images() {
   debug "${FUNCNAME[0]}"
 
   # Reuse the existing output
   if [[ -d "$BINDIR" ]]; then
-        if askOk "$BINDIR exists. Rebuild?"; then
+    if ask_ok "$BINDIR exists. Rebuild?"; then
       execute rm -rf "$BINDIR"
     else
       return 0
     fi
   fi
 
+  debug make image BIN_DIR="$BINDIR" \
+    PROFILE="$DEVICE" PACKAGES="$PACKAGES" \
+    FILES="$FILESDIR" --directory="$BUILDDIR" \
+    --jobs="$(($(nproc) - 1))"
+
   make image \
     BIN_DIR="$BINDIR" \
     PROFILE="$DEVICE" \
@@ -468,26 +401,12 @@ makeImages() {
     > "$BUILDDIR/make.log"
 }
 
-
-verifyImages() {
+flash_images() {
   debug "${FUNCNAME[0]}"
-
-    declare outfile
-
-    for outfile in "$BINDIR"/*.img.gz; do
-        verify "$outfile" "$IB_OUT_SHA256_FILE" || return 1
-    done
-}
-
-
-flashImage() {
-    debug "${FUNCNAME[0]}"
-
-    declare img_gz="$1"
-    declare dev="$2"
-    
-    declare img="${img_gz%.gz}"
-    declare partitions
+  local img_gz="$1"
+  local dev="$2"
+  local img="${img_gz%.gz}"
+  local partitions
 
   if [[ ! -e "$dev" ]]; then
     echo "The device specified by --flash could not be found"
@@ -511,18 +430,15 @@ flashImage() {
     echo "Image flashed sucessfully!"
   else
     echo "dd failed!"
-        exit 1
+    return 1
   fi
 }
 
-
-sshUpgrade() {
+ssh_upgrade() {
   debug "${FUNCNAME[0]}"
-
-    declare img_gz="$1"
-    declare ssh_path="$2"
-
-    declare img_fname="${img_gz##*/}"
+  local img_gz="$1"
+  local ssh_path="$2"
+  local img_fname="${img_gz##*/}"
 
   if ! [[ -f $img_gz ]]; then
     echo "$img_gz is missing, check build output"
@@ -544,31 +460,24 @@ sshUpgrade() {
   ssh "$ssh_path" "sysupgrade -F /tmp/$img_fname"
 }
 
-
-fromSource() {
-    debug "${FUNCNAME[0]}"
-
-    declare src_url="https://github.com/openwrt/openwrt.git"
-    declare seed_file="$GITWORKTREEDIR/.config"
-    declare pkg kopt opt commit seed_file wt_cmd wt_commit description
-    declare -a make_opts config_opts
+from_source() {
+  debug "${FUNCNAME[0]}" "$*"
+  local seed_url="$1"
+  local src_url="https://github.com/openwrt/openwrt.git"
+  local seed_file="$GITWORKTREEDIR/.config"
+  local pkg config commit seed_file wt_commit description
+  local -a make_opts config_opts
 
   echo "Building from source is under development"
 
   # Update source code
   if [[ ! -d "$GITSRCDIR" ]]; then
-        mkdir -p "$GITSRCDIR"
-        git clone "$src_url" "$GITSRCDIR"
+    execute mkdir -p "$GITSRCDIR"
+    execute git clone "$src_url" "$GITSRCDIR"
   fi
 
   git -C "$GITSRCDIR" pull
  
-    wt_cmd=(git -C "$GITSRCDIR"
-            worktree add
-            --force
-            --detach
-            "$GITWORKTREEDIR")
- 
   # Generate commitish for git worktree
   case "$RELEASE" in
     snapshot)
@@ -577,7 +486,7 @@ fromSource() {
     [0-9][0-9].[0-9][0-9].*)
       local branch="openwrt-${RELEASE%.*}"
       local tag="v$RELEASE"
-            if askOk "Use $branch branch HEAD (y, recommended) or $tag tag (N)?"; then
+      if ask_ok "Use $branch branch HEAD (y, recommended) or $tag tag (N)?"; then
         wt_commit="origin/$branch"
       else
         wt_commit="$tag"
@@ -589,9 +498,17 @@ fromSource() {
       ;;
   esac
 
-    # [[ -d "$GITWORKTREEDIR" ]] && rm -rf "$GITWORKTREEDIR"
+  # TODO There's a bug in the make clean functions that seem to invoke a full make
+  # if [[ -d "$GITWORKTREEDIR" ]]; then
+  #   execute git -C "$GITWORKTREEDIR" checkout "$wt_commit"
+  #   execute git -C "$GITWORKTREEDIR" pull
+  # else
+  #   execute git -C "$GITSRCDIR" worktree add --force --detach "$GITWORKTREEDIR" "$wt_commit"
+  # fi
 
-    execute "${wt_cmd[@]}" "$wt_commit"
+  # To workaround bug, don't use make *clean, blow it away and start fresh
+  [[ -d "$GITWORKTREEDIR" ]] && execute rm -rf "$GITWORKTREEDIR"
+  execute git -C "$GITSRCDIR" worktree add --force --detach "$GITWORKTREEDIR" "$wt_commit"
 
   # Print commit information
   commit=$(git -C "$GITWORKTREEDIR" rev-parse HEAD)
@@ -608,7 +525,7 @@ fromSource() {
   fi
 
   # Enter worktree
-    pushd "$GITWORKTREEDIR" || return 1
+  execute pushd "$GITWORKTREEDIR" || return 1
 
   # Update package feed
   ./scripts/feeds update -i -f &&
@@ -616,8 +533,8 @@ fromSource() {
   ./scripts/feeds install -a -f
 
   # Grab the release seed config
-    if ! curl -so "$seed_file" "$SEED_URL"; then
-        echo "Could not obtain $seed_file from $SEED_URL"
+  if ! execute "$DL_TOOL" "-o" "$seed_file" "$seed_url"; then
+    echo "Could not obtain $seed_file from $seed_url"
     return 1
   fi
 
@@ -633,13 +550,13 @@ fromSource() {
     fi
   done
 
-    # Add kopts from profile
-    for kopt in ${P_ARR[kopts]}; do
-        config_opts+=("$kopt")
+  # Add config options from profile
+  for config in ${P_ARR[config]}; do
+    config_opts+=("$config")
   done
 
   # Only compile selected fs
-    sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file"
+  execute sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file"
   config_opts+=("CONFIG_TARGET_PER_DEVICE_ROOTFS=n")
   if [[ $FILESYSTEM == "squashfs" ]]; then
     config_opts+=("CONFIG_TARGET_ROOTFS_EXT4FS=n")
@@ -650,7 +567,7 @@ fromSource() {
   fi
 
   # Only compile selected target image
-    sed -i '/CONFIG_TARGET_DEVICE_/d' "$seed_file"
+  execute sed -i '/CONFIG_TARGET_DEVICE_/d' "$seed_file"
   config_opts+=("CONFIG_TARGET_MULTI_PROFILE=n")
   config_opts+=("CONFIG_TARGET_PROFILE=DEVICE_$DEVICE")
   config_opts+=("CONFIG_TARGET_${TARGET//\//_}_DEVICE_$DEVICE=y")
@@ -660,9 +577,9 @@ fromSource() {
   config_opts+=("CONFIG_MAKE_TOOLCHAIN=n")
   
   # Write options to config seed file
-    for opt in "${config_opts[@]}"; do
-        debug "Writing $opt to $seed_file"
-        echo "$opt" >> "$seed_file"
+  for config in "${config_opts[@]}"; do
+    debug "Writing $config to $seed_file"
+    echo "$config" >> "$seed_file"
   done
 
   # Cleaning modes
@@ -671,19 +588,21 @@ fromSource() {
   # make dirclean # compiled output, toolchain, build tools
   # make distclean # compiled output, toolchain, build tools, .config, feeds, .ccache
 
-    # Make image
+  # Make prep
   ((DEBUG)) && make_opts+=("V=s")
+  #execute make "${make_opts[@]}" "-j1" dirclean # TODO 'dirclean' has a bug that triggers menuconfig
+  execute make "${make_opts[@]}" "-j1" defconfig
+  execute make "${make_opts[@]}" "-j1" download
 
-    execute make "${make_opts[@]}" defconfig download clean
-
-    make_opts+=("-j$(($(nproc) - 2))")
-    #make_opts+=("-j1") # for debugging purposes
-
-    execute make "${make_opts[@]}" world
+  # Make image
+  if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" "-j$(($(nproc)+1))" world; then
+    echo "Error: make failed"
+    return 1
+  fi
 
   popd || return 1
 
-    # Provide symlinks to images in root of BINDIR (to match Image Builder)
+  # Symlink output images to root of BINDIR (match Image Builder)
   shopt -s nullglob
   for image in "$BINDIR/targets/${TARGET}/"*.{img,img.gz,ubi}; do
     ln -fs "$image" "$BINDIR/${image##*/}"
@@ -695,7 +614,7 @@ fromSource() {
 
 # Generic helpers
 debug() { ((DEBUG)) && echo "Debug: $*"; }
-askOk() {
+ask_ok() {
   ((YES)) && return
   local r
   read -r -p "$* [y/N]: " r
@@ -703,19 +622,19 @@ askOk() {
   [[ "$r" =~ ^(yes|y)$ ]]
 }
 extract() {
-    debug "${FUNCNAME[0]}"
-    declare archive="$1"
-    declare out_dir="$2"
+  debug "${FUNCNAME[0]}" "$*"
+  local archive="$1"
+  local out_dir="$2"
   if ! execute tar -axf "$archive" -C "$out_dir" --strip-components 1; then
     echo "Extraction failed"
     return 1
   fi
 }
 verify() {
-    debug "${FUNCNAME[0]}"
-    declare file_to_check="$1"
-    declare sumfile="$2"
-    declare checksum
+  debug "${FUNCNAME[0]}" "$*"
+  local file_to_check="$1"
+  local sumfile="$2"
+  local checksum
 
   hash sha256sum &>/dev/null || return 1
   [[ -f $sumfile && -f $file_to_check ]] || return 1
@@ -723,26 +642,25 @@ verify() {
   echo -n "$checksum $file_to_check" | sha256sum --check --status
 }
 load() {
-    debug "${FUNCNAME[0]}"
-    declare source_file="$1"
+  debug "${FUNCNAME[0]}" "$*"
+  local source_file="$1"
   # shellcheck disable=SC1090
   [[ -f $source_file ]] && source "$source_file"
 }
 execute() {
-    declare cmd="$*"
-    debug "$cmd" || cmd+=" &>/dev/null"
-    eval "${cmd[*]}"
+  if debug "$*"; then
+    "$@"
+  else
+    "$@" &>/dev/null
+  fi
 }
 
-
 main() {
   debug "${FUNCNAME[0]}"
 
   init
-
   load "$SCRIPTDIR/profiles"
-   
-    readInput "$@"
+  parse_input "$@"
 
   # Fallback to SCRIPTDIR if BUILDROOT has not been set
   declare -g BUILDROOT="${BUILDROOT:=$SCRIPTDIR}"
@@ -755,21 +673,21 @@ main() {
   fi
 
   for dir in "$BUILDROOT/src" "$BUILDROOT/bin"; do
-        [[ -d "$dir" ]] || mkdir -p "$dir"
+    [[ -d "$dir" ]] || execute mkdir -p "$dir"
   done
 
   # Allow --reset without a profile
   if ((RESET)) && [[ ${#PROFILES} -lt 1 ]]; then
     for d in "$BUILDROOT/src" "$BUILDROOT/bin"; do
-            askOk "Remove $d?" && execute rm -rf "$d"
+      ask_ok "Remove $d?" && execute rm -rf "$d"
     done
     exit $?
   fi
 
-    installDependencies
+  install_dependencies
 
   for profile in "${PROFILES[@]}"; do
-        debug "Starting profile: $profile"
+    debug "Running profile: $profile"
 
     if [[ ! ${!profile@a} = A ]]; then
       echo "Profile '$profile' does not exist"
@@ -778,26 +696,17 @@ main() {
 
     # Store profile in P_ARR nameref
     declare -gn P_ARR="$profile"
-
-        # Load profile
     declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"
     declare -g TARGET="${P_ARR[target]}"
     declare -g DEVICE="${P_ARR[device]}"
     declare -g PACKAGES="${P_ARR[packages]:-}"
-
-        # Release precedence: user input>profile>env>hardcode
     declare -g RELEASE="${USER_RELEASE:=${P_ARR[release]:=$RELEASE}}"
 
-        # normalize release input
+    # normalize RELEASE
     case "$RELEASE" in
-            snapshot|latest|main|master) # normalize aliases
-                RELEASE="snapshot"
-                ;;
-            v[0-9][0-9].[0-9][0-9].*) # tag to semantic
-                RELEASE="${RELEASE#v}"
-                ;;
-            [0-9][0-9].[0-9][0-9].*)
-                ;;
+      snapshot|latest|main|master) RELEASE="snapshot" ;;
+      v[0-9][0-9].[0-9][0-9].*) RELEASE="${RELEASE#v}" ;;
+      [0-9][0-9].[0-9][0-9].*) ;;
       *)
         if ! ((FROM_SOURCE)); then
           echo "Error: Invalid release version format"
@@ -812,90 +721,66 @@ main() {
     declare -g BUILDDIR="$BUILDROOT/src/$profile/$RELEASE"
     declare -g BINDIR="$BUILDROOT/bin/$profile/$RELEASE"
 
-        if (( RESET )); then
-            if (( FROM_SOURCE )); then
-                [[ -d $GITWORKTREEDIR ]] && askOk "Remove $GITWORKTREEDIR?"
-                    execute git worktree remove --force "$GITWORKTREEDIR"
-                    execute rm -rf "$GITWORKTREEDIR"
-            elif [[ -d $BUILDDIR ]] && askOk "Remove $BUILDDIR?"; then
-                execute rm -rf "$BUILDDIR"
-            fi
-        fi
-
     if [[ "$RELEASE" == "snapshot" ]]; then
-            declare url_prefix="https://downloads.openwrt.org/snapshots/targets/$TARGET"
-            declare url_filename="openwrt-imagebuilder-${TARGET//\//-}.Linux-x86_64.tar.zst"
-            declare img_fname="openwrt-${TARGET//\//-}-$DEVICE-$FILESYSTEM" 
+      local url_prefix="https://downloads.openwrt.org/snapshots/targets/$TARGET"
+      local url_filename="openwrt-imagebuilder-${TARGET//\//-}.Linux-x86_64.tar.zst"
+      local img_fname="openwrt-${TARGET//\//-}-$DEVICE-$FILESYSTEM" 
     else
-            declare url_prefix="https://downloads.openwrt.org/releases/$RELEASE/targets/$TARGET"
-            declare url_filename="openwrt-imagebuilder-$RELEASE-${TARGET//\//-}.Linux-x86_64.tar.xz"
-            declare img_fname="openwrt-$RELEASE-${TARGET//\//-}-$DEVICE-$FILESYSTEM"
+      local url_prefix="https://downloads.openwrt.org/releases/$RELEASE/targets/$TARGET"
+      local url_filename="openwrt-imagebuilder-$RELEASE-${TARGET//\//-}.Linux-x86_64.tar.xz"
+      local img_fname="openwrt-$RELEASE-${TARGET//\//-}-$DEVICE-$FILESYSTEM"
     fi
 
-        declare ib_url="$url_prefix/$url_filename"
+    local ib_url="$url_prefix/$url_filename"
+    local ib_file="$BUILDDIR/$url_filename"
+    local ib_sha256_url="$url_prefix/sha256sums"
+    local ib_sha256_file="$BUILDDIR/sha256sums"
+    local seed_url="$url_prefix/config.buildinfo"
 
     if ((FROM_SOURCE)); then
       declare -g SYSUPGRADEIMGGZ="$BINDIR/targets/$img_fname-sysupgrade.img.gz"
-            declare -g SEED_URL="$url_prefix/config.buildinfo"
     else
       declare -g SYSUPGRADEIMGGZ="$BUILDDIR/$img_fname-sysupgrade.img.gz"
-            declare -g IB_ARCHIVE="$BUILDDIR/$url_filename"
-            declare -g IB_SHA256_URL="$url_prefix/sha256sums"
-            declare -g IB_SHA256_FILE="$IB_ARCHIVE.sha256sums"
-            declare -g IB_OUT_SHA256_FILE="$BINDIR/sha256sums"
+    fi
+
+    if ((RESET)); then
+      if ((FROM_SOURCE)); then
+        [[ -d $GITWORKTREEDIR ]] && ask_ok "Remove $GITWORKTREEDIR?"
+          execute git worktree remove --force "$GITWORKTREEDIR"
+          execute rm -rf "$GITWORKTREEDIR"
+      elif [[ -d $BUILDDIR ]] && ask_ok "Remove $BUILDDIR?"; then
+        execute rm -rf "$BUILDDIR"
+      fi
     fi
 
     if ((DEBUG)); then
       echo "Profile settings:"
       for x in "${!P_ARR[@]}"; do printf "%s=%s\n" "$x" "${P_ARR[$x]}"; done
-            echo "Build settings:"
-            cat <<- EOF
-				PROFILE, P_ARR (should match)=$profile, ${!P_ARR}
-				BUILDROOT=$BUILDROOT
-				BUILDDIR=$BUILDDIR
-				GITSRCDIR=$GITSRCDIR
-				GITWORKTREEDIR=$GITWORKTREEDIR
-				BINDIR=$BINDIR
-				TARGET=$TARGET
-				DEVICE=$DEVICE
-				RELEASE=$RELEASE
-				FILESYSTEM=$FILESYSTEM
-				SYSUPGRADEIMGGZ=$SYSUPGRADEIMGGZ
-				ib_url=$ib_url
-			EOF
+      echo "Environment variables:"
+      declare -p
     fi
 
     if ((FROM_SOURCE)); then
-            fromSource || return $?
+      from_source "$seed_url" || return $?
     else
       [[ -d $BUILDDIR ]] || mkdir -p "$BUILDDIR"
-            getImageBuilder "$ib_url" && 
-            getImageBuilderChecksum &&
-            verify "$IB_ARCHIVE" "$IB_SHA256_FILE" &&
-            extract "$IB_ARCHIVE" "$BUILDDIR" || return $?
-            addRepos
-            makeImages &&
-            verifyImages
+      get_imagebuilder "$ib_url" "$ib_file" "$ib_sha256_url" "$ib_sha256_file" && 
+      verify "$ib_file" "$ib_sha256_file" &&
+      extract "$ib_file" "$BUILDDIR" || return $?
+      add_repos
+      make_images
+      # Verify output iamges
+      for outfile in "$BINDIR"/*.img.gz; do
+        verify "$outfile" "$ib_sha256_file" || return 1
+      done
       #copyFiles
     fi
 
-        [[ -v SSH_BACKUP_PATH ]] && 
-            sshBackup
-        [[ -v SSH_UPGRADE_PATH ]] && 
-            sshUpgrade "$SYSUPGRADEIMGGZ" "$SSH_UPGRADE_PATH"
-        [[ -v FLASH_DEV ]] && 
-            flashImage "$SYSUPGRADEIMGGZ" "$FLASH_DEV"
+    [[ -v SSH_BACKUP_PATH ]] && ssh_backup
+    [[ -v SSH_UPGRADE_PATH ]] && ssh_upgrade "$SYSUPGRADEIMGGZ" "$SSH_UPGRADE_PATH"
+    [[ -v FLASH_DEV ]] && flash_images "$SYSUPGRADEIMGGZ" "$FLASH_DEV"
   done
 }
 
 main "$@"
-exit
-
-
-# VM setup (for testing)
-# sudo sgdisk -N 0 /dev/vda && 
-# sudo mkfs.ext4 /dev/vda1
-
-# mkdir ~/mnt
-# sudo mount /dev/vda1 ~/mnt
-# sudo chown liveuser:liveuser -R ~/mnt
+exit $?

profiles

@@ -7,24 +7,23 @@
 default_packages="\
 	luci \
 	luci-ssl \
+	luci-proto-wireguard \
+	luci-app-statistics \
+	collectd-mod-sensors \
+	collectd-mod-thermal \
+	collectd-mod-conntrack \
+	collectd-mod-cpu \
 	nano \
 	htop \
 	diffutils \
 	tar \
 	iperf3 \
-	bash \
+	zsh \
 	rsync \
-	luci-app-statistics \
-	luci-app-attendedsysupgrade \
-	collectd-mod-sensors \
-	collectd-mod-thermal \
-	collectd-mod-conntrack \
-	collectd-mod-cpu"
+	openssh-sftp-server \
+"
 
-#################
 # Current devices
-#################
-
 # Main router
 declare -Ag r4s
 r4s['device']="friendlyarm_nanopi-r4s"
@@ -32,9 +31,8 @@ r4s['target']="rockchip/armv8"
 r4s['filesystem']="ext4"
 r4s['packages']="\
 	$default_packages \
-	luci-app-wireguard \
-	luci-proto-wireguard \
 	luci-app-ddns \
+	luci-app-sqm \
 	irqbalance \
 	collectd-mod-df \
 	usbutils \
@@ -47,10 +45,9 @@ r4s['packages']="\
 	avahi-daemon \
 	curl \
 	ethtool \
-	ca-bundle \
-	-libustream-wolfssl"
+	ca-bundle"
 # The following are source mode only
-r4s['kopts']="\
+r4s['config']="\
 	CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \
 	CONFIG_BTRFS_PROGS_ZSTD=y \
 	CONFIG_TARGET_ROOTFS_PARTSIZE=512 \
@@ -58,7 +55,7 @@ r4s['kopts']="\
 r4s['files']="\
 	/mnt/backup"
 
-# WDS mesh nodes
+# Access point
 declare -Ag ax6000
 ax6000['device']="xiaomi_redmi-router-ax6000-stock"
 ax6000['target']="mediatek/filogic"
@@ -70,22 +67,6 @@ ax6000['packages']="\
 	-odhcpd-ipv6only \
 	-nftables \
 	-firewall4"
-	# for 802.11s
-	# mesh11sd \
-	# -wpad-basic-mbedtls \
-	# wpad-mesh-mbedtls"
-
-# WDS mesh nodes
-declare -Ag ax6000_ap
-ax6000_ap['device']="xiaomi_redmi-router-ax6000-stock"
-ax6000_ap['target']="mediatek/filogic"
-ax6000_ap['release']="snapshot"
-ax6000_ap['filesystem']="squashfs"
-ax6000_ap['packages']="\
-	$default_packages \
-	avahi-daemon \
-	smcroute \
-	ca-bundle"
 
 # For converted uboots
 # declare -Ag ax6000_uboot
@@ -109,8 +90,6 @@ n5100['target']="x86/64"
 n5100['filesystem']="squashfs"
 n5100['packages']="\
 	$default_packages \
-	luci-app-wireguard \
-	luci-proto-wireguard \
 	luci-app-ddns \
 	irqbalance \
 	collectd-mod-df \
@@ -135,7 +114,7 @@ n5100['packages']="\
 	tailscale \
 	shadow-useradd"
 # The following are source mode only
-n5100['kopts']="\
+n5100['config']="\
 	CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \
 	CONFIG_BTRFS_PROGS_ZSTD=y \
 	CONFIG_TARGET_ROOTFS_PARTSIZE=512 \
@@ -153,27 +132,20 @@ rpi4['packages']="\
 	kmod-usb-net-asix-ax88179 \
 	kmod-usb-net-rtl8152 \
 	luci-app-upnp \
-	luci-app-wireguard \
 	luci-app-pbr \
 	-dnsmasq \
 	dnsmasq-full \
 	luci-app-ddns \
 	luci-app-sqm"
 
-
-#################
 # Stock builds
-#################
 declare -Ag r4s_stock
 r4s_stock['device']="friendlyarm_nanopi-r4s"
 r4s_stock['target']="rockchip/armv8"
 r4s_stock['filesystem']="ext4"
 r4s_stock['release']="snapshot"
 
-
-#################
 # Old devices
-#################
 declare -Ag totolink
 totolink['device']="totolink_x5000r"
 totolink['target']="ramips/mt7621"
@@ -216,7 +188,6 @@ r2s['filesystem']="ext4"
 r2s['packages']="\
 	$default_packages \
 	luci-app-upnp \
-	luci-app-wireguard \
 	luci-app-pbr \
 	-dnsmasq \
 	dnsmasq-full \
@@ -237,7 +208,6 @@ r2s_tr['filesystem']="ext4"
 r2s_tr['packages']="\
 	$default_packages \
 	luci-app-upnp \
-	luci-app-wireguard \
 	luci-app-pbr \
 	luci-app-ddns \
 	luci-app-statistics \