From 4375f49afc994815381359ef8718f5ef5cdded7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?=
 <hector@molinero.dev>
Date: Sat, 23 Jan 2021 15:05:17 +0100
Subject: [PATCH] Shell fixes

---
 packer/qemu/start-vm.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packer/qemu/start-vm.sh b/packer/qemu/start-vm.sh
index 2be6917..926b12d 100755
--- a/packer/qemu/start-vm.sh
+++ b/packer/qemu/start-vm.sh
@@ -3,7 +3,7 @@
 set -eu
 export LC_ALL=C
 
-SRC_DIR=$(dirname "$(dirname "$(readlink -f "$0")")")
+SRC_DIR=$(CDPATH='' cd -- "$(dirname -- "${0:?}")" && pwd -P)
 TMP_DIR=$(mktemp -d)
 
 ORIGINAL_DISK=${SRC_DIR:?}/dist/qemu/wireguard.qcow2
@@ -13,7 +13,8 @@ USERDATA_YAML=${SRC_DIR:?}/qemu/http/seed/user-data
 USERDATA_DISK=${TMP_DIR:?}/seed.img
 
 # Remove temporary files on exit
-trap 'rm -rf "${TMP_DIR:?}"; trap - EXIT; exit 0' EXIT TERM INT HUP
+# shellcheck disable=SC2154
+trap 'ret="$?"; rm -rf -- "${TMP_DIR:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
 
 # Create a snapshot image to preserve the original image
 qemu-img create -b "${ORIGINAL_DISK:?}" -f qcow2 "${SNAPSHOT_DISK:?}"