From 9b66c54486a58d334ccc697bddd9d40c7a236908 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 31 Dec 2022 08:05:27 +0100
Subject: Use more variables

---
 tests/create-and-run.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests/create-and-run.sh')

diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh
index c92ce1f..540e6c4 100755
--- a/tests/create-and-run.sh
+++ b/tests/create-and-run.sh
@@ -1,28 +1,29 @@
 #!/bin/sh
 
 if test "$#" -ne 2; then
-	echo "$(basename "$0") takes two positional arguments. architecture and release" 1>&2
+	echo "$(basename "$0") takes two positional arguments: architecture and release" 1>&2
 	exit 1
 fi
 ARCHITECTURE=$1
 RELEASE=$2
+SSH_KEYPATH=ssh_id
+IMAGE=test.ext4
 
 set -eux
 
 . "$(dirname "$0")/test_common.sh"
 
 cleanup() {
-	rm -f ssh_id ssh_id.pub test.ext4
+	rm -f "$SSH_KEYPATH" "$SSH_KEYPATH.pub" "$IMAGE"
 }
 
 trap cleanup EXIT INT TERM QUIT
 
-SSH_KEYPATH=ssh_id
 ssh-keygen -f "$SSH_KEYPATH" -N ''
-debvm-create -k "$SSH_KEYPATH.pub" -o test.ext4 -a "$ARCHITECTURE" -r "$RELEASE"
+debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -a "$ARCHITECTURE" -r "$RELEASE"
 
 SSH_PORT=2222
-timeout 240s debvm-run -s "$SSH_PORT" -i test.ext4 &
+timeout 240s debvm-run -s "$SSH_PORT" -i "$IMAGE" &
 set -- localhost
 test "$RELEASE" = jessie && set -- -o PubkeyAcceptedKeyTypes=+ssh-rsa "$@"
 wait_ssh "$@"
-- 
cgit v1.2.3