From 8883e814b610a7cf0b6350392b554cd02f0e21a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 15 Dec 2023 15:51:48 +0100 Subject: [PATCH] meta-lxatac-software: tac-gadget: fix shellcheck warnings in helper scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../tac-gadget/files/gadget-audio.sh | 6 +-- .../tac-gadget/files/gadget-common.sh | 50 +++++++++---------- .../files/gadget-ethernet-serial.sh | 14 +++--- .../files/gadget-ethernet-storage.sh | 18 +++---- .../tac-gadget/files/gadget-ethernet.sh | 10 ++-- .../tac-gadget/files/gadget-hid-storage.sh | 22 ++++---- .../tac-gadget/files/gadget-hid.sh | 14 +++--- .../tac-gadget/files/gadget-reports.sh | 2 + .../tac-gadget/files/gadget-serial-storage.sh | 14 +++--- .../tac-gadget/files/gadget-serial.sh | 6 +-- .../tac-gadget/files/gadget-storage.sh | 10 ++-- 11 files changed, 84 insertions(+), 82 deletions(-) diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-audio.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-audio.sh index d22c29b1..52cba8ba 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-audio.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-audio.sh @@ -4,14 +4,14 @@ set -e -u -o pipefail source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-audio +DEVDIR="${MAINDIR:?}/gadget-audio" clear_gadget setup_gadget # Set up audio -mkdir $DEVDIR/functions/uac2.usb0 -ln -s $DEVDIR/functions/uac2.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/uac2.usb0" +ln -s "${DEVDIR}/functions/uac2.usb0" "${DEVDIR}/configs/c.1" start_gadget diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-common.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-common.sh index c1a97d39..45377e1d 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-common.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-common.sh @@ -13,29 +13,29 @@ PRODUCTNAME="LXATAC" UDC_ADDR="49000000.usb-otg" clear_gadget () { - if [ -s $DEVDIR/UDC ]; then + if [[ -s "${DEVDIR}/UDC" ]]; then echo "USB Gadget is already set up." exit 11 - elif [ -s $MAINDIR/*/UDC ]; then + elif [[ -s "${MAINDIR}"/*/UDC ]]; then echo "Remove existing USB Gadgets." # when removing a gadget we have to reverse the init process - for dir in $MAINDIR/*/configs/*/strings/*; do - [ -d $dir ] && rmdir $dir + for dir in "${MAINDIR}"/*/configs/*/strings/*; do + test -d "${dir}" && rmdir "${dir}" done - for func in $MAINDIR/*/configs/*.*/*.*; do - [ -e $func ] && rm $func + for func in "${MAINDIR}"/*/configs/*.*/*.*; do + test -e "${func}" && rm "${func}" done - for conf in $MAINDIR/*/configs/*; do - [ -d $conf ] && rmdir $conf + for conf in "${MAINDIR}"/*/configs/*; do + test -d "${conf}" && rmdir "${conf}" done - for func in $MAINDIR/*/functions/*.*; do - [ -d $func ] && rmdir $func + for func in "${MAINDIR}"/*/functions/*.*; do + test -d "${func}" && rmdir "${func}" done - for str in $MAINDIR/*/strings/*; do - [ -d $str ] && rmdir $str + for str in "${MAINDIR}"/*/strings/*; do + test -d "${str}" && rmdir "${str}" done - rmdir $MAINDIR/* - elif [ -n $DEVDIR ]; then + rmdir "${MAINDIR}"/* + elif [[ -n "${DEVDIR}" ]]; then modprobe libcomposite else echo "Nothing to do here." @@ -45,20 +45,20 @@ clear_gadget () { setup_gadget () { echo "Set up new USB Gadget." - mkdir $DEVDIR - echo $VENDOR > $DEVDIR/idVendor - echo $PRODUCT > $DEVDIR/idProduct + mkdir "${DEVDIR}" + echo "${VENDOR}" > "${DEVDIR}/idVendor" + echo "${PRODUCT}" > "${DEVDIR}/idProduct" - mkdir $DEVDIR/strings/0x409 # set language to EN-US - echo $SERIAL > $DEVDIR/strings/0x409/serialnumber - echo $VENDORNAME > $DEVDIR/strings/0x409/manufacturer - echo $PRODUCTNAME > $DEVDIR/strings/0x409/product + mkdir "${DEVDIR}/strings/0x409" # set language to EN-US + echo "${SERIAL:?}" > "${DEVDIR}/strings/0x409/serialnumber" + echo "${VENDORNAME}" > "${DEVDIR}/strings/0x409/manufacturer" + echo "${PRODUCTNAME}" > "${DEVDIR}/strings/0x409/product" - mkdir $DEVDIR/configs/c.1 - mkdir $DEVDIR/configs/c.1/strings/0x409 - echo Normal > $DEVDIR/configs/c.1/strings/0x409/configuration + mkdir "${DEVDIR}/configs/c.1" + mkdir "${DEVDIR}/configs/c.1/strings/0x409" + echo Normal > "${DEVDIR}/configs/c.1/strings/0x409/configuration" } start_gadget () { - echo $UDC_ADDR > $DEVDIR/UDC + echo "${UDC_ADDR}" > "${DEVDIR}/UDC" } diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-serial.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-serial.sh index 9dca5727..f5853669 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-serial.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-serial.sh @@ -4,20 +4,20 @@ set -e -u -o pipefail source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-ethernet-serial +DEVDIR="${MAINDIR:?}/gadget-ethernet-serial" clear_gadget setup_gadget # Set up ethernet -mkdir $DEVDIR/functions/ecm.usb0 -echo $HOST_MAC > $DEVDIR/functions/ecm.usb0/host_addr -echo $DEV_MAC > $DEVDIR/functions/ecm.usb0/dev_addr -ln -s $DEVDIR/functions/ecm.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/ecm.usb0" +echo "${HOST_MAC:?}" > "${DEVDIR}/functions/ecm.usb0/host_addr" +echo "${DEV_MAC:?}" > "${DEVDIR}/functions/ecm.usb0/dev_addr" +ln -s "${DEVDIR}/functions/ecm.usb0" "${DEVDIR}/configs/c.1" # Set up serial -mkdir $DEVDIR/functions/acm.usb0 -ln -s $DEVDIR/functions/acm.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/acm.usb0" +ln -s "${DEVDIR}/functions/acm.usb0" "${DEVDIR}/configs/c.1" start_gadget exit 0 diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-storage.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-storage.sh index eb4ac26b..343f5921 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-storage.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet-storage.sh @@ -3,28 +3,28 @@ set -e -u -o pipefail STORAGE=${1:-} -if [ -z $STORAGE ]; then +if [[ -z "${STORAGE}" ]]; then echo "ERROR: No medium given. Start again with image location attached to command." exit 1 fi source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-ethernet-storage +DEVDIR="${MAINDIR:?}/gadget-ethernet-storage" clear_gadget setup_gadget # Set up ethernet -mkdir $DEVDIR/functions/ecm.usb0 -echo $HOST_MAC > $DEVDIR/functions/ecm.usb0/host_addr -echo $DEV_MAC > $DEVDIR/functions/ecm.usb0/dev_addr -ln -s $DEVDIR/functions/ecm.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/ecm.usb0" +echo "${HOST_MAC:?} > ${DEVDIR}/functions/ecm.usb0/host_addr" +echo "${DEV_MAC:?} > ${DEVDIR}/functions/ecm.usb0/dev_addr" +ln -s "${DEVDIR}/functions/ecm.usb0" "${DEVDIR}/configs/c.1" # Set up storage -mkdir $DEVDIR/functions/mass_storage.usb0 -echo $STORAGE > $DEVDIR/functions/mass_storage.usb0/lun.0/file -ln -s $DEVDIR/functions/mass_storage.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/mass_storage.usb0" +echo "${STORAGE}" > "${DEVDIR}/functions/mass_storage.usb0/lun.0/file" +ln -s "${DEVDIR}/functions/mass_storage.usb0" "${DEVDIR}/configs/c.1" start_gadget exit 0 diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet.sh index 54fde1f4..c9133f98 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-ethernet.sh @@ -4,16 +4,16 @@ set -e -u -o pipefail source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-ethernet +DEVDIR="${MAINDIR:?}/gadget-ethernet" clear_gadget setup_gadget # Set up ethernet -mkdir $DEVDIR/functions/ecm.usb0 -echo $HOST_MAC > $DEVDIR/functions/ecm.usb0/host_addr -echo $DEV_MAC > $DEVDIR/functions/ecm.usb0/dev_addr -ln -s $DEVDIR/functions/ecm.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/ecm.usb0" +echo "${HOST_MAC:?}" > "${DEVDIR}/functions/ecm.usb0/host_addr" +echo "${DEV_MAC:?}" > "${DEVDIR}/functions/ecm.usb0/dev_addr" +ln -s "${DEVDIR}/functions/ecm.usb0" "${DEVDIR}/configs/c.1" start_gadget diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid-storage.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid-storage.sh index d2c31cb0..b2c41503 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid-storage.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid-storage.sh @@ -3,7 +3,7 @@ set -e -u -o pipefail STORAGE=${1:-} -if [ -z $STORAGE ]; then +if [[ -z "${STORAGE}" ]]; then echo "ERROR: No medium given. Start again with image location attached to command." exit 1 fi @@ -11,23 +11,23 @@ fi source /usr/share/gadget/gadget-common source /usr/share/gadget/gadget-reports -DEVDIR=$MAINDIR/gadget-hid-storage +DEVDIR="${MAINDIR:?}/gadget-hid-storage" clear_gadget setup_gadget # Set up mass storage -mkdir $DEVDIR/functions/mass_storage.usb0 -echo $STORAGE > $DEVDIR/functions/mass_storage.usb0/lun.0/file -ln -s $DEVDIR/functions/mass_storage.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/mass_storage.usb0" +echo "${STORAGE}" > "${DEVDIR}/functions/mass_storage.usb0/lun.0/file" +ln -s "${DEVDIR}/functions/mass_storage.usb0" "${DEVDIR}/configs/c.1" # Set up HID -mkdir $DEVDIR/functions/hid.usb0 -echo 1 > $DEVDIR/functions/hid.usb0/protocol -echo 1 > $DEVDIR/functions/hid.usb0/subclass -echo 8 > $DEVDIR/functions/hid.usb0/report_length -report_keyboard > $DEVDIR/functions/hid.usb0/report_desc -ln -s $DEVDIR/functions/hid.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/hid.usb0" +echo 1 > "${DEVDIR}/functions/hid.usb0/protocol" +echo 1 > "${DEVDIR}/functions/hid.usb0/subclass" +echo 8 > "${DEVDIR}/functions/hid.usb0/report_length" +report_keyboard > "${DEVDIR}/functions/hid.usb0/report_desc" +ln -s "${DEVDIR}/functions/hid.usb0" "${DEVDIR}/configs/c.1" start_gadget diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid.sh index cb258222..b156c9c0 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-hid.sh @@ -5,19 +5,19 @@ set -e -u -o pipefail source /usr/share/gadget/gadget-common source /usr/share/gadget/gadget-reports -DEVDIR=$MAINDIR/gadget-hid +DEVDIR="${MAINDIR:?}/gadget-hid" echo "Will export keyboard configuration." clear_gadget setup_gadget # Set up HID -mkdir $DEVDIR/functions/hid.usb0 -echo 1 > $DEVDIR/functions/hid.usb0/protocol -echo 1 > $DEVDIR/functions/hid.usb0/subclass -echo 8 > $DEVDIR/functions/hid.usb0/report_length -report_keyboard > $DEVDIR/functions/hid.usb0/report_desc -ln -s $DEVDIR/functions/hid.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/hid.usb0" +echo 1 > "${DEVDIR}/functions/hid.usb0/protocol" +echo 1 > "${DEVDIR}/functions/hid.usb0/subclass" +echo 8 > "${DEVDIR}/functions/hid.usb0/report_length" +report_keyboard > "${DEVDIR}/functions/hid.usb0/report_desc" +ln -s "${DEVDIR}/functions/hid.usb0" "${DEVDIR}/configs/c.1" start_gadget diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-reports.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-reports.sh index 588ecb80..8a9c5866 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-reports.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-reports.sh @@ -1,3 +1,5 @@ +#!/bin/bash + report_keyboard () { # sample report descriptor, taken from Documentation/usb/gadget_hid.rst echo -ne \\x05\\x01\\x09\\x06\\xa1\\x01\\x05\\x07\\x19\\xe0\\x29\\xe7\\x15\\x00\\x25\\x01\\x75\\x01\\x95\\x08\\x81\\x02\\x95\\x01\\x75\\x08\\x81\\x03\\x95\\x05\\x75\\x01\\x05\\x08\\x19\\x01\\x29\\x05\\x91\\x02\\x95\\x01\\x75\\x03\\x91\\x03\\x95\\x06\\x75\\x08\\x15\\x00\\x25\\x65\\x05\\x07\\x19\\x00\\x29\\x65\\x81\\x00\\xc0 diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial-storage.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial-storage.sh index cdbdd9d2..9d84263d 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial-storage.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial-storage.sh @@ -3,26 +3,26 @@ set -e -u -o pipefail STORAGE=${1:-} -if [ -z $STORAGE ]; then +if [[ -z "${STORAGE}" ]]; then echo "ERROR: No medium given. Start again with image location attached to command." exit 1 fi source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-serial-storage +DEVDIR="${MAINDIR:?}/gadget-serial-storage" clear_gadget setup_gadget # Set up mass storage -mkdir $DEVDIR/functions/mass_storage.usb0 -echo $STORAGE > $DEVDIR/functions/mass_storage.usb0/lun.0/file -ln -s $DEVDIR/functions/mass_storage.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/mass_storage.usb0" +echo "${STORAGE}" > "${DEVDIR}/functions/mass_storage.usb0/lun.0/file" +ln -s "${DEVDIR}/functions/mass_storage.usb0" "${DEVDIR}/configs/c.1" # Set up serial -mkdir $DEVDIR/functions/acm.usb0 -ln -s $DEVDIR/functions/acm.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/acm.usb0" +ln -s "${DEVDIR}/functions/acm.usb0" "${DEVDIR}/configs/c.1" start_gadget diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial.sh index a428c1d0..bdfae7a4 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-serial.sh @@ -4,14 +4,14 @@ set -e -u -o pipefail source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-serial +DEVDIR="${MAINDIR:?}/gadget-serial" clear_gadget setup_gadget # Set up serial -mkdir $DEVDIR/functions/acm.usb0 -ln -s $DEVDIR/functions/acm.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/acm.usb0" +ln -s "${DEVDIR}/functions/acm.usb0" "${DEVDIR}/configs/c.1" start_gadget diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-storage.sh b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-storage.sh index 8ba0bb6a..83eed733 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-storage.sh +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/files/gadget-storage.sh @@ -3,22 +3,22 @@ set -e -u -o pipefail STORAGE=${1:-} -if [ -z $STORAGE ]; then +if [[ -z "${STORAGE}" ]]; then echo "ERROR: No medium given. Start again with image location attached to command." exit 1 fi source /usr/share/gadget/gadget-common -DEVDIR=$MAINDIR/gadget-storage +DEVDIR="${MAINDIR:?}/gadget-storage" clear_gadget setup_gadget # Set up storage -mkdir $DEVDIR/functions/mass_storage.usb0 -echo $STORAGE > $DEVDIR/functions/mass_storage.usb0/lun.0/file -ln -s $DEVDIR/functions/mass_storage.usb0 $DEVDIR/configs/c.1 +mkdir "${DEVDIR}/functions/mass_storage.usb0" +echo "${STORAGE}" > "${DEVDIR}/functions/mass_storage.usb0/lun.0/file" +ln -s "${DEVDIR}/functions/mass_storage.usb0" "${DEVDIR}/configs/c.1" start_gadget