add check on blockdevice

CHANGELOG

@@ -3,6 +3,7 @@ On the road to 2024.08:
 Environment:
 - updated and unified usage information in all scripts
 - added clean-blockdevice.sh script
+- added bash completion for restore-usbstick.sh and clean-blockdevice.sh
 ---
 Highlights 2024.07:
 - kernel 6.10.x

usr/bin/archboot-clean-blockdevice.sh

@@ -16,19 +16,19 @@ _usage()
 }
 ##################################################
 [[ -z "${1}" ]] && _usage
-### check for root
-if ! [[ ${UID} -eq 0 ]]; then 
-    echo "ERROR: Please run as root user!"
-    exit 1
-fi
+_root_check
 echo -e "\e[1mCleaning blockdevice(s) $*...\e[m"
 echo -e "\e[91mWARNING: 10 seconds for hitting CTRL+C to stop the process on $* now! \e[m"
 sleep 10
 #shellcheck disable=SC2068
 for i in $@; do
-    echo -e "\e[1mSTEP 1/2:\e[m Cleaning ${i} filesystem signatures..."
-    wipefs -f -a "${i}"
-    echo -e "\e[1mSTEP 2/2:\e[m Cleaning ${i} partition table..."
-    dd if=/dev/zero of="${i}" bs=1M count=10
-    echo -e "\e[1mFinished ${i}.\e[m"
+    if [[ -b "${i}" ]]; then
+        echo -e "\e[1mSTEP 1/2:\e[m Cleaning ${i} filesystem signatures..."
+        wipefs -f -a "${i}"
+        echo -e "\e[1mSTEP 2/2:\e[m Cleaning ${i} partition table..."
+        dd if=/dev/zero of="${i}" bs=1M count=10
+        echo -e "\e[1mFinished ${i}.\e[m"
+    else
+        echo -e "\e[1m\e[91mError: ${i} not a valid blockdevice! \e[m"
+    fi
 done

usr/bin/archboot-restore-usbstick.sh

@@ -14,22 +14,19 @@ _usage()
     exit 0
 }
 ##################################################
-[[ -z "${1}" ]] && _usage "$@"
-### check for root
-if ! [[ ${UID} -eq 0 ]]; then 
-    echo "ERROR: Please run as root user!"
-    exit 1
-fi
-echo -e "\e[91mWARNING: 10 seconds for hitting CTRL+C to stop the process on ${1} now! \e[m"
-sleep 10
-# clean partitiontable
-echo -e "\e[1mRestoring USB STICK...\e[m"
-echo -e "\e[1mSTEP 1/3:\e[m Cleaning partition table..."
-dd if=/dev/zero of="${1}" bs=512 count=2048
-wipefs -a "${1}"
-# create new MBR and partition on <DEVICE>
-echo -e "\e[1mSTEP 2/3:\e[m Create new MBR and partitiontable..."
-fdisk "${1}" <<EOF
+[[ -z "${1}" ]] && _usage
+_root_check
+if [[ -b "${1}" ]]; then
+    echo -e "\e[91mWARNING: 10 seconds for hitting CTRL+C to stop the process on ${1} now! \e[m"
+    sleep 10
+    # clean partitiontable
+    echo -e "\e[1mRestoring USB STICK...\e[m"
+    echo -e "\e[1mSTEP 1/3:\e[m Cleaning partition table..."
+    dd if=/dev/zero of="${1}" bs=512 count=2048
+    wipefs -a "${1}"
+    # create new MBR and partition on <DEVICE>
+    echo -e "\e[1mSTEP 2/3:\e[m Create new MBR and partitiontable..."
+    fdisk "${1}" <<EOF
 n
 p
 1
@@ -39,9 +36,12 @@ t
 b
 w
 EOF
-# wait for partitiontable to be resynced
-sleep 5
-# create FAT32 filesystem on <device-partition>
-echo -e "\e[1mSTEP 3/3:\e[m Create FAT32 filesystem..."
-mkfs.vfat -F32 "${1}"1
-echo -e "\e[1mFinished.\e[m"
+    # wait for partitiontable to be resynced
+    sleep 5
+    # create FAT32 filesystem on <device-partition>
+    echo -e "\e[1mSTEP 3/3:\e[m Create FAT32 filesystem..."
+    mkfs.vfat -F32 "${1}"1
+    echo -e "\e[1mFinished.\e[m"
+else
+    echo -e "\e[1m\e[91mError: ${1} not a valid blockdevice! \e[m"
+fi

usr/bin/archboot-secureboot-keys.sh

@@ -17,7 +17,7 @@ _DIR="${2}"
 while [ $# -gt 0 ]; do
     case ${1} in
         -name=*|--name=*) NAME="$(echo "${1}" | rg -o '=(.*)' -r '$1')" ;;
-        -h|--h|?) _usage ;;
+        -h|--h|-help|--help|?) _usage ;;
         esac
     shift
 done

usr/lib/archboot/cpio/cpio.sh

@@ -14,6 +14,7 @@ _usage() {
     echo -e "\e[1m---------------\e[m"
     echo "Tool for creating an archboot initramfs image."
     echo
+    echo "Options:"
     echo " -h               Display this message and exit"
     echo " -c <config>      Use <config> file"
     echo " -g <path>        Generate cpio image and write to specified <path>"
@@ -38,12 +39,12 @@ while [ $# -gt 0 ]; do
             _TARGET_DIR="${1}"
             ;;
         -g) shift
-            [[ -d "${1}" ]] && _abort "Invalid image path -- ${1} is a directory!"
+            [[ -d "${1}" ]] && _abort "Invalid image path -- ${1} is an existing directory!"
             if ! _GENERATE_IMAGE="$(readlink -f "${1}")" || [[ ! -e "${_GENERATE_IMAGE%/*}" ]]; then
                 _abort "Unable to write to path!" "${1}"
             fi
             ;;
-        -h) _usage
+        -h|--h|-help|--help|?) _usage
             ;;
     esac
     shift

usr/share/bash-completion/completions/restore-usbstick.sh

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# created by Tobias Powalowski <tpowa@archlinux.org>
+_restore_usbstick()
+{
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    compopt -o bashdefault -o default
+    COMPREPLY=( $(compgen -W "$(lsblk -pnro NAME,TRAN,TYPE | rg '(.*) disk$' -r '$1' | rg (.*) usb$' -r '$1')" -- $cur) )
+    return 0
+}
+complete -F _restore_usbstick restore-usbstick.sh