Fix optional shellcheck warnings

Additionally fix a few code style issues found with shfmt.

.editorconfig

@@ -16,6 +16,10 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 max_line_length = 120
+# for shfmt
+switch_case_indent = true
+binary_next_line = true
+
 
 [*.{yml,yaml}]
 end_of_line = lf
@@ -32,3 +36,6 @@ trim_trailing_whitespace = true
 charset = utf-8
 indent_style = space
 indent_size = 2
+
+[Makefile]
+indent_style = tab

.gitlab/ci/build_archiso.sh

@@ -55,7 +55,7 @@ cleanup() {
     # clean up temporary directories
     print_section_start "cleanup" "Cleaning up temporary directory"
 
-  if [ -n "${tmpdir_base:-}" ]; then
+    if [[ -n "${tmpdir_base:-}" ]]; then
         rm -fr "${tmpdir_base}"
     fi
 
@@ -128,8 +128,9 @@ create_metrics() {
                 # shellcheck disable=SC2046
                 # shellcheck disable=SC2183
                 printf 'initramfs_size_mebibytes{image="%s",initramfs="%s"} %s\n' \
-          $(du -m -- "${tmpdir}/iso/"*/boot/**/initramfs*.img | \
+                    $(
-            awk -v profile="${profile}" \
+                        du -m -- "${tmpdir}/iso/"*/boot/**/initramfs*.img \
+                            | awk -v profile="${profile}" \
                                 'function basename(file) {
                                     sub(".*/", "", file)
                                     return file

archiso/mkarchiso

@@ -284,8 +284,8 @@ _make_pacman_conf() {
     _profile_cache_dirs="$(pacman-conf --config "${pacman_conf}" CacheDir | tr '\n' ' ')"
 
     # Only use the profile's CacheDir, if it is not the default and not the same as the system cache dir.
-    if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] && \
+    if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] \
-        [[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
+        && [[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
         _cache_dirs="${_profile_cache_dirs}"
     else
         _cache_dirs="${_system_cache_dirs}"
@@ -297,8 +297,8 @@ _make_pacman_conf() {
     # append CacheDir and HookDir to [options] section
     # HookDir is *always* set to the airootfs' override directory
     # see `man 8 pacman` for further info
-    pacman-conf --config "${pacman_conf}" | \
+    pacman-conf --config "${pacman_conf}" \
-        sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
+        | sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
         /\[options\]/a HookDir = ${pacstrap_dir}/etc/pacman.d/hooks/" >"${work_dir}/${buildmode}.pacman.conf"
 }
 
@@ -527,7 +527,8 @@ _make_efibootimg() {
     fi
 
     # Convert from bytes to KiB and round up to the next full MiB with an additional MiB for reserved sectors.
-    imgsize_kib="$(awk 'function ceil(x){return int(x)+(x>int(x))}
+    imgsize_kib="$(
+        awk 'function ceil(x){return int(x)+(x>int(x))}
             function byte_to_kib(x){return x/1024}
             function mib_to_kib(x){return x*1024}
             END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}' <<<"${imgsize_bytes}"

configs/releng/airootfs/root/.automated_script.sh

@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
 
-script_cmdline ()
+script_cmdline() {
-{
     local param
     for param in $(</proc/cmdline); do
         case "${param}" in
-            script=*) echo "${param#*=}" ; return 0 ;;
+            script=*)
+                echo "${param#*=}"
+                return 0
+                ;;
         esac
     done
 }
 
-automated_script ()
+automated_script() {
-{
     local script rt
     script="$(script_cmdline)"
     if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then

configs/releng/airootfs/usr/local/bin/choose-mirror

@@ -6,16 +6,17 @@ get_cmdline() {
     local param
     for param in $(</proc/cmdline); do
         case "${param}" in
-            $1=*) echo "${param##*=}";
+            "${1}="*)
+                echo "${param##*=}"
                 return 0
                 ;;
         esac
     done
 }
 
-mirror=$(get_cmdline mirror)
+mirror="$(get_cmdline mirror)"
-[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv)
+[[ "$mirror" == 'auto' ]] && mirror="$(get_cmdline archiso_http_srv)"
-[[ $mirror ]] || exit 0
+[[ -n "$mirror" ]] || exit 0
 
 mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
 cat >/etc/pacman.d/mirrorlist <<EOF

configs/releng/airootfs/usr/local/bin/livecd-sound

@@ -19,9 +19,8 @@ bugout () {
     stat_fail
 }
 
-echo_card_indices()
+echo_card_indices() {
-{
+    if [[ -f /proc/asound/cards ]]; then
-    if [ -f /proc/asound/cards ] ; then
         sed -n -e's/^[[:space:]]*\([0-7]\)[[:space:]].*/\1/p' /proc/asound/cards
     fi
 }
@@ -34,7 +33,7 @@ echo_card_indices()
 # $2 <control>
 # $3 <level>
 unmute_and_set_level() {
-    { [ "$3" ] &&[ "$2" ] && [ "$1" ] ; } || bugout
+    [[ -n "$3" && -n "$2" && -n "$1" ]] || bugout
     systemd-cat -t "livecdsound" printf "Setting: %s on card: %s to %s\n" "$2" "$1" "$3"
     systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3" unmute
     return 0
@@ -42,9 +41,8 @@ unmute_and_set_level(){
 
 # $1 <card id>
 # $2 <control>
-mute_and_zero_level()
+mute_and_zero_level() {
-{
+    [[ -n "$1" && -n "$2" ]] || bugout
-    { [ "$1" ] && [ "$2" ] ; } || bugout
     systemd-cat -t "livecdsound" printf "Muting control: %s on card: %s\n" "$2" "$1"
     systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "0%" mute
     return 0
@@ -53,17 +51,15 @@ mute_and_zero_level()
 # $1 <card ID>
 # $2 <control>
 # $3 "on" | "off"
-switch_control()
+switch_control() {
-{
+    [[ -n "$3" && -n "$1" ]] || bugout
-    { [ "$3" ] && [ "$1" ] ; } || bugout
     systemd-cat -t "livecdsound" printf "Switching control: %s on card: %s to %s\n" "$2" "$1" "$3"
     systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3"
     return 0
 }
 
 # $1 <card ID>
-sanify_levels_on_card()
+sanify_levels_on_card() {
-{
     unmute_and_set_level "$1" "Front" "80%"
     unmute_and_set_level "$1" "Master" "80%"
     unmute_and_set_level "$1" "Master Mono" "80%"
@@ -134,8 +130,7 @@ sanify_levels_on_card()
 }
 
 # $1 <card ID> | "all"
-sanify_levels()
+sanify_levels() {
-{
     local ttsdml_returnstatus=0
     local card
     case "$1" in
@@ -148,59 +143,55 @@ sanify_levels()
             sanify_levels_on_card "$1" || ttsdml_returnstatus=1
             ;;
     esac
-    return $ttsdml_returnstatus
+    return "$ttsdml_returnstatus"
 }
 
 # List all cards that *should* be usable for PCM audio.  In my experience,
 # the console speaker (handled by the pcsp driver) isn't a suitable playback
 # device, so we'll exclude it.
-list_non_pcsp_cards()
+list_non_pcsp_cards() {
-{
     for card in $(echo_card_indices); do
         local cardfile="/proc/asound/card${card}/id"
-        if [ -r "$cardfile" ] && [ -f "$cardfile" ] && \
+        if [[ -r "$cardfile" && -f "$cardfile" && "$(cat "$cardfile")" != pcsp ]]; then
-            [ "$(cat "$cardfile")" != pcsp ]; then
             echo "$card"
         fi
     done
 }
 
 # Properly initialize the sound card so that we have audio at boot.
-unmute_all_cards()
+unmute_all_cards() {
-{
     sanify_levels all
 }
 
 is_numeric() {
-    local str=$1
+    local str="$1"
     [[ "$str" =~ ^[0-9]+$ ]]
 }
 
 set_default_card() {
-    local card=$1
+    local card="$1"
     sed -e "s/%card%/$card/g" </usr/local/share/livecd-sound/asound.conf.in \
         >/etc/asound.conf
 }
 
 play_on_card() {
-    local card=$1 file=$2
+    local card="$1" file="$2"
     aplay -q "-Dplughw:$card,0" "$file"
 }
 
 # If there are multiple usable sound cards, prompt the user to choose one,
 # using auditory feedback.
-pick_a_card()
+pick_a_card() {
-{
     set -f
     usable_cards="$(list_non_pcsp_cards)"
     num_usable_cards="$(wc -w <<<"$usable_cards")"
 
-    if [ "$num_usable_cards" -eq 1 ]; then
+    if (( num_usable_cards == 1 )); then
         systemd-cat -t "livecdsound" printf "Only one sound card is detected\n"
         exit 0
     fi
     systemd-cat -t "livecdsound" printf "multiple sound cards detected\n"
-    for card in $usable_cards; do
+    for card in "${usable_cards[@]}"; do
         if ! is_numeric "$card"; then
             continue
         fi
@@ -208,7 +199,7 @@ pick_a_card()
     done
     wait
     sleep 1
-    for card in $usable_cards; do
+    for card in "${usable_cards[@]}"; do
         if ! is_numeric "$card"; then
             continue
         fi
@@ -221,7 +212,7 @@ pick_a_card()
     done
 }
 
-if [[  $# -eq 0 ]]; then
+if (( $# == 0 )); then
     echo "error: No argument passed."
     exit 1
 fi

scripts/run_archiso.sh

@@ -11,7 +11,6 @@
 # - qemu
 # - edk2-ovmf (when UEFI booting)
 
-
 set -eu
 
 print_help() {