From ed7de96c1f121c91078c1a9200ac389a95c5d07c Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@kinvolk.io>
Date: Tue, 15 Sep 2020 17:49:33 -0400
Subject: [PATCH] qemu_template: shell lint and update

Signed-off-by: Vincent Batts <vbatts@kinvolk.io>
---
 build_library/qemu_template.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/build_library/qemu_template.sh b/build_library/qemu_template.sh
index bf840a0ea5..7f28cf5a93 100755
--- a/build_library/qemu_template.sh
+++ b/build_library/qemu_template.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SCRIPT_DIR="`dirname "$0"`"
+SCRIPT_DIR="$(dirname "$0")"
 VM_BOARD=
 VM_NAME=
 VM_UUID=
@@ -11,7 +11,7 @@ VM_MEMORY=
 VM_CDROM=
 VM_PFLASH_RO=
 VM_PFLASH_RW=
-VM_NCPUS="`grep -c ^processor /proc/cpuinfo`"
+VM_NCPUS="$(nproc)"
 SSH_PORT=2222
 SSH_KEYS=""
 CLOUD_CONFIG_FILE=""
@@ -112,10 +112,12 @@ write_ssh_keys() {
 
 if [ -z "${CONFIG_IMAGE}" ]; then
     CONFIG_DRIVE=$(mktemp -t -d flatcar-configdrive.XXXXXXXXXX)
-    if [ $? -ne 0 ] || [ ! -d "$CONFIG_DRIVE" ]; then
+    ret=$?
+    if [ "$ret" -ne 0 ] || [ ! -d "$CONFIG_DRIVE" ]; then
         echo "$0: mktemp -d failed!" >&2
         exit 1
     fi
+    # shellcheck disable=SC2064
     trap "rm -rf '$CONFIG_DRIVE'" EXIT
     mkdir -p "${CONFIG_DRIVE}/openstack/latest"
 
@@ -126,7 +128,8 @@ if [ -z "${CONFIG_IMAGE}" ]; then
             exit 1
         fi
         SSH_KEYS_TEXT=$(cat "$SSH_KEYS")
-        if [ $? -ne 0 ] || [ -z "$SSH_KEYS_TEXT" ]; then
+        ret=$?
+        if [ "$ret" -ne 0 ] || [ -z "$SSH_KEYS_TEXT" ]; then
             echo "$0: Failed to read SSH keys from $SSH_KEYS" >&2
             exit 1
         fi
@@ -134,7 +137,8 @@ if [ -z "${CONFIG_IMAGE}" ]; then
             "${CONFIG_DRIVE}/openstack/latest/user_data"
     elif [ -n "${CLOUD_CONFIG_FILE}" ]; then
         cp "${CLOUD_CONFIG_FILE}" "${CONFIG_DRIVE}/openstack/latest/user_data"
-        if [ $? -ne 0 ]; then
+        ret=$?
+        if [ "$ret" -ne 0 ]; then
             echo "$0: Failed to copy cloudinit file from $CLOUD_CONFIG_FILE" >&2
             exit 1
         fi