From: Jan Kiszka <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
---
build-images.sh | 33 +++++++++++++++++----------------
scripts/make_release | 10 +++++-----
start-qemu.sh | 18 ++++++++++--------
3 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/build-images.sh b/build-images.sh
index 772bdbd..7b5d071 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -12,16 +12,17 @@
usage()
{
- echo "Usage: $0 [OPTIONS]"
- echo -e "\nOptions:"
- echo -e "--latest\tBuild latest Jailhouse version from next branch."
- echo -e "--all\t\tBuild all available images (may take hours...)."
- echo -e "--shell\t\tDrop into a shell to issue bitbake commands" \
- "manually."
+ printf "%b" "Usage: $0 [OPTIONS]\n"
+ printf "%b" "\nOptions:\n"
+ printf "%b" "--latest\tBuild latest Jailhouse version from next" \
+ "branch.\n"
+ printf "%b" "--all\t\tBuild all available images (may take hours...).\n"
+ printf "%b" "--shell\t\tDrop into a shell to issue bitbake commands" \
+ "manually.\n"
exit 1
}
-JAILHOUSE_IMAGES=$(dirname $0)
+JAILHOUSE_IMAGES=$(dirname "$0")
KAS_CONTAINER=${KAS_CONTAINER:-${JAILHOUSE_IMAGES}/kas-container}
KAS_FILES="${JAILHOUSE_IMAGES}/kas.yml"
CMD="build"
@@ -38,9 +39,9 @@ while [ $# -gt 0 ]; do
;;
--all)
KAS_TARGET=
- while read MACHINE DESCRIPTION; do
+ while read -r MACHINE DESCRIPTION; do
KAS_TARGET="${KAS_TARGET}
mc:${MACHINE}-jailhouse-demo:demo-image"
- done < ${JAILHOUSE_IMAGES}/images.list
+ done < "${JAILHOUSE_IMAGES}/images.list"
shift 1
;;
--shell)
@@ -58,22 +59,22 @@ if [ -z "${KAS_TARGET}" ]; then
IFS=" "
MACHINES=
NUM_MACHINES=0
- while read MACHINE DESCRIPTION; do
+ while read -r MACHINE DESCRIPTION; do
MACHINES="${MACHINES} ${MACHINE}"
NUM_MACHINES=$((NUM_MACHINES + 1))
echo " ${NUM_MACHINES}: ${DESCRIPTION}"
- done < ${JAILHOUSE_IMAGES}/images.list
+ done < "${JAILHOUSE_IMAGES}/images.list"
echo " 0: all (may take hours...)"
echo ""
- echo -n "Select images to build (space-separated index list): "
- read SELECTION
+ printf "Select images to build (space-separated index list): "
+ read -r SELECTION
[ -z "${SELECTION}" ] && exit 0
IFS=" "
KAS_TARGET=
for IDX in ${SELECTION}; do
- if [ ${IDX} -eq 0 ] 2>/dev/null; then
+ if [ "${IDX}" -eq 0 ] 2>/dev/null; then
KAS_TARGET=
for MACHINE in ${MACHINES}; do
KAS_TARGET="${KAS_TARGET}
mc:${MACHINE}-jailhouse-demo:demo-image"
@@ -83,7 +84,7 @@ if [ -z "${KAS_TARGET}" ]; then
N=1
for MACHINE in ${MACHINES}; do
- if [ ${N} -eq ${IDX} ] 2>/dev/null; then
+ if [ ${N} -eq "${IDX}" ] 2>/dev/null; then
KAS_TARGET="${KAS_TARGET}
mc:${MACHINE}-jailhouse-demo:demo-image"
break
fi
@@ -97,4 +98,4 @@ if [ -z "${KAS_TARGET}" ]; then
fi
export KAS_TARGET
-${KAS_CONTAINER} ${CMD} ${KAS_FILES}
+${KAS_CONTAINER} ${CMD} "${KAS_FILES}"
diff --git a/scripts/make_release b/scripts/make_release
index dfa2048..e1927ca 100755
--- a/scripts/make_release
+++ b/scripts/make_release
@@ -26,17 +26,17 @@ if [ ! -d .git ]; then
exit 1
fi
-if [ -n "`git status -s -uno`" ]; then
+if [ -n "$(git status -s -uno)" ]; then
echo "Working directory is dirty!"
exit 1
fi
-echo -e "Tag commit\n\n `git log -1 --oneline`"
-echo -e "\nof branch\n\n `git branch | sed -n 's/^\* //p'`"
+echo -e "Tag commit\n\n $(git log -1 --oneline)"
+echo -e "\nof branch\n\n $(git branch | sed -n 's/^\* //p')"
echo -ne "\nas $name? (y/N) "
-read answer
+read -r answer
if [ "$answer" != "y" ]; then
exit 1
fi
-git tag -as $name -m "Release $name"
+git tag -as "$name" -m "Release $name"
diff --git a/start-qemu.sh b/start-qemu.sh
index 1472b99..65385a7 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -12,9 +12,9 @@
usage()
{
- echo "Usage: $0 ARCHITECTURE [QEMU_OPTIONS]"
- echo -e "\nSet QEMU_PATH environment variable to use a locally " \
- "built QEMU version"
+ printf "%b" "Usage: $0 ARCHITECTURE [QEMU_OPTIONS]\n"
+ printf "%b" "\nSet QEMU_PATH environment variable to use a locally " \
+ "built QEMU version\n"
exit 1
}
@@ -64,13 +64,15 @@ case "$1" in
;;
esac
-IMAGE_PREFIX="$(dirname
$0)/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/demo-image-jailhouse-demo-qemu-${DISTRO_ARCH}"
-IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img)
+IMAGE_PREFIX="$(dirname
"$0")/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/demo-image-jailhouse-demo-qemu-${DISTRO_ARCH}"
+IMAGE_FILE=$(ls "${IMAGE_PREFIX}.ext4.img")
shift 1
-${QEMU_PATH}${QEMU} \
- -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \
+# SC2086: Double quote to prevent globbing and word splitting.
+# shellcheck disable=2086
+"${QEMU_PATH}${QEMU}" \
+ -drive file="${IMAGE_FILE}",discard=unmap,if=none,id=disk,format=raw \
-m 1G -serial mon:stdio -netdev user,id=net \
-kernel "${IMAGE_PREFIX}-${KERNEL_SUFFIX}" -append "${KERNEL_CMDLINE}" \
- -initrd ${IMAGE_PREFIX}-initrd.img ${QEMU_EXTRA_ARGS} "$@"
+ -initrd "${IMAGE_PREFIX}-initrd.img" ${QEMU_EXTRA_ARGS} "$@"
--
2.26.2
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/3bdc60c9c2e3237b9d32ff4af69f3f3964083042.1618866389.git.jan.kiszka%40siemens.com.
