From ddf01407948cebf72e53221d11c3bfb816cecfbe Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 8 Feb 2022 17:20:48 +0100 Subject: [PATCH] small fixes detected by shellcheck --- usr/lib/archboot/release_functions | 4 ++-- usr/lib/archboot/server_functions | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/lib/archboot/release_functions b/usr/lib/archboot/release_functions index 697037023..60dda1dc5 100644 --- a/usr/lib/archboot/release_functions +++ b/usr/lib/archboot/release_functions @@ -20,7 +20,7 @@ _create_iso() { mkdir -p "${1}" cd "${1}" || exit 1 # create container - archboot-${_RUNNING_ARCH}-create-container.sh "${_W_DIR}" -cc -cp || exit 1 + archboot-"${_RUNNING_ARCH}"-create-container.sh "${_W_DIR}" -cc -cp || exit 1 # generate tarball in container, umount tmp it's a tmpfs and weird things could happen then echo "Generate ISO ..." # generate iso in container @@ -39,7 +39,7 @@ _create_iso() { echo "Homepage: https://wiki.archlinux.org/title/Archboot";\ echo "Architecture: ${_RUNNING_ARCH}";\ echo "RAM requirement to boot: 1152 MB or greater";\ - echo "Archboot:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi ${_ARCHBOOT} | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\ + echo "Archboot:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi "${_ARCHBOOT}" | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\ echo "Kernel:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi linux | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\ echo "Pacman:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi pacman | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\ echo "Systemd:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi systemd | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")") >>Release.txt diff --git a/usr/lib/archboot/server_functions b/usr/lib/archboot/server_functions index 9817c0460..8f83ec1fa 100644 --- a/usr/lib/archboot/server_functions +++ b/usr/lib/archboot/server_functions @@ -1,7 +1,7 @@ #!/bin/bash _DIRECTORY="$(date +%Y.%m)" _ISOHOME="/home/tobias/Arch/iso/${_ARCH}" -_BUILDDIR="$(mktemp -d ${_ISOHOME}/server-release.XXX)" +_BUILDDIR="$(mktemp -d "${_ISOHOME}"/server-release.XXX)" _SERVER="pkgbuild.com" _SERVER_HOME="/home/tpowa/" _SERVER_DIR="/home/tpowa/public_html/archboot-images"