apply hints from shellcheck linting

Author: mwindower

centos/context/install.sh

@@ -14,8 +14,8 @@ echo -e "nameserver 1.1.1.1\nnameserver 1.0.0.1" > /etc/resolv.conf
 readonly CONSOLE=$(yq r /etc/metal/install.yaml console)
 
 # Serial port and speed are required by grub
-readonly SERIAL_PORT=$(echo ${CONSOLE} | cut -d , -f 1 | tr -dc '0-9')
-readonly SERIAL_SPEED=$(echo ${CONSOLE} | cut -d , -f 2 | cut -d n -f 1 | tr -dc '0-9')
+readonly SERIAL_PORT=$(echo "${CONSOLE}" | cut -d , -f 1 | tr -dc '0-9')
+readonly SERIAL_SPEED=$(echo "${CONSOLE}" | cut -d , -f 2 | cut -d n -f 1 | tr -dc '0-9')
 
 export diskjson="/etc/metal/disk.json"
 
@@ -56,7 +56,7 @@ useradd --create-home --gid "wheel" --shell /bin/bash $user
 echo "set password for $user to $pass expires after 1 day."
 echo -e "$pass\n$pass" | passwd $user
 
-if [ $devmode == "true" ]; then
+if [ "$devmode" == "true" ]; then
     echo "password valid for 24h: user:$user password:$pass" >> /etc/issue
 fi
 
@@ -78,7 +78,7 @@ if [ -d /sys/firmware/efi ]
 then
     echo "System was booted with UEFI"
     grub2-mkconfig -o /boot/efi/EFI/centos/grub.cfg
-    grub2-install --target=x86_64-efi --efi-directory=${EFI_MOUNTPOINT} --boot-directory=/boot --bootloader-id=${BOOTLOADER_ID} UUID=${ROOT_UUID}
+    grub2-install --target=x86_64-efi --efi-directory=${EFI_MOUNTPOINT} --boot-directory=/boot --bootloader-id="${BOOTLOADER_ID}" UUID="${ROOT_UUID}"
 else
     echo "System was booted with Bios"
     grub2-mkconfig -o /boot/grub2/grub.cfg

centos/export.sh

@@ -5,7 +5,7 @@ readonly SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}
 readonly DOCKER_IMAGE="quay.io/metalstack/${OS_NAME}:${SEMVER}"
 readonly IMAGE_BASENAME=img
 
-readonly SEMVER_PATCH_DIR=$(echo ${SEMVER_PATCH} | tr -d ".")
+readonly SEMVER_PATCH_DIR=$(echo "${SEMVER_PATCH}" | tr -d ".")
 readonly TARGET_PATH="images${OUTPUT_FOLDER}/${OS_NAME}/${SEMVER_MAJOR_MINOR}/${SEMVER_PATCH_DIR}"
 readonly EXPORT_DIRECTORY="../${TARGET_PATH}"
 
@@ -15,11 +15,11 @@ readonly MD5="${IMAGE_BASENAME}.tar.lz4.md5"
 readonly PKG="packages.txt"
 
 # export tarball with checksum from docker image and package list
-mkdir -p ${EXPORT_DIRECTORY}
-cd ${EXPORT_DIRECTORY}
-docker export $(docker create ${DOCKER_IMAGE}) > ${TAR}
+mkdir -p "${EXPORT_DIRECTORY}"
+cd "${EXPORT_DIRECTORY}"
+docker export "$(docker create "${DOCKER_IMAGE}")" > ${TAR}
 # FIXME unify with global export
-docker run --rm ${DOCKER_IMAGE} bash -c "rpm -qa" > ${PKG}
+docker run --rm "${DOCKER_IMAGE}" bash -c "rpm -qa" > ${PKG}
 lz4 -f -9 ${TAR} ${LZ4}
 rm -f ${TAR}
 md5sum ${LZ4} > ${MD5}

debian/context/install.sh

@@ -24,8 +24,8 @@ RESOLV
 readonly CONSOLE=$(yq r /etc/metal/install.yaml console)
 
 # Serial port and speed are required by grub
-readonly SERIAL_PORT=$(echo ${CONSOLE} | cut -d , -f 1 | tr -dc '0-9')
-readonly SERIAL_SPEED=$(echo ${CONSOLE} | cut -d , -f 2 | cut -d n -f 1 | tr -dc '0-9')
+readonly SERIAL_PORT=$(echo "${CONSOLE}" | cut -d , -f 1 | tr -dc '0-9')
+readonly SERIAL_SPEED=$(echo "${CONSOLE}" | cut -d , -f 2 | cut -d n -f 1 | tr -dc '0-9')
 
 export diskjson="/etc/metal/disk.json"
 
@@ -126,7 +126,7 @@ REBOOT
 cat << EOM >/etc/default/grub
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR=$(lsb_release -i -s || echo ${BOOTLOADER_ID})
+GRUB_DISTRIBUTOR=$(lsb_release -i -s || echo "${BOOTLOADER_ID}")
 GRUB_CMDLINE_LINUX_DEFAULT=""
 GRUB_CMDLINE_LINUX="${CMDLINE}"
 GRUB_TERMINAL=serial
@@ -136,7 +136,7 @@ EOM
 if [ -d /sys/firmware/efi ]
 then
     echo "System was booted with UEFI"
-    grub-install --target=x86_64-efi --efi-directory=${EFI_MOUNTPOINT} --boot-directory=/boot --bootloader-id=${BOOTLOADER_ID}
+    grub-install --target=x86_64-efi --efi-directory=${EFI_MOUNTPOINT} --boot-directory=/boot --bootloader-id="${BOOTLOADER_ID}"
     update-grub2
     dpkg-reconfigure grub-efi-amd64-bin
 else

export.sh

@@ -5,7 +5,7 @@ readonly SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}
 readonly DOCKER_IMAGE="quay.io/metalstack/${OS_NAME}:${SEMVER}"
 readonly IMAGE_BASENAME=img
 
-readonly SEMVER_PATCH_DIR=$(echo ${SEMVER_PATCH} | tr -d ".")
+readonly SEMVER_PATCH_DIR=$(echo "${SEMVER_PATCH}" | tr -d ".")
 readonly TARGET_PATH="images${OUTPUT_FOLDER}/${OS_NAME}/${SEMVER_MAJOR_MINOR}/${SEMVER_PATCH_DIR}"
 readonly EXPORT_DIRECTORY="../${TARGET_PATH}"
 
@@ -15,10 +15,10 @@ readonly MD5="${IMAGE_BASENAME}.tar.lz4.md5"
 readonly PKG="packages.txt"
 
 # export tarball with checksum from docker image and package list
-mkdir -p ${EXPORT_DIRECTORY}
-cd ${EXPORT_DIRECTORY}
-docker export $(docker create ${DOCKER_IMAGE}) > ${TAR}
-docker run --rm ${DOCKER_IMAGE} bash -c "dpkg -l" > ${PKG}
+mkdir -p "${EXPORT_DIRECTORY}"
+cd "${EXPORT_DIRECTORY}"
+docker export "$(docker create "${DOCKER_IMAGE}")" > ${TAR}
+docker run --rm "${DOCKER_IMAGE}" bash -c "dpkg -l" > ${PKG}
 lz4 -f -9 ${TAR} ${LZ4}
 rm -f ${TAR}
 md5sum ${LZ4} > ${MD5}

firewall/context/network.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-cd /etc/metal/networker
+cd /etc/metal/networker || exit
 ./metal-networker firewall configure --input /etc/metal/install.yaml

prepare.sh

@@ -19,4 +19,4 @@ fi
 echo "Generating build metadata"
 mkdir -p "${OS_FLAVOR}/context/etc/metal"
 BUILD_META_FILE="${OS_FLAVOR}/context/etc/metal/build.yaml"
-python -c "import yaml; from datetime import datetime; print yaml.dump(dict(builddate=datetime.now(), commit_ref=\"${BRANCH}\", commit_sha1=\"${GITHUB_SHA}\", gitrepo=\"${GITHUB_REPOSITORY}\"), default_flow_style=False)" | tee -a ${BUILD_META_FILE}
+python -c "import yaml; from datetime import datetime; print yaml.dump(dict(builddate=datetime.now(), commit_ref=\"${BRANCH}\", commit_sha1=\"${GITHUB_SHA}\", gitrepo=\"${GITHUB_REPOSITORY}\"), default_flow_style=False)" | tee -a "${BUILD_META_FILE}"