summaryrefslogtreecommitdiff
path: root/scripts/build/binary_memtest
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-12 01:21:39 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-03-17 18:57:02 +0000
commit04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (patch)
tree17d1ccea5c085c5afd62361d2fe97a14c951cb9b /scripts/build/binary_memtest
parentbea349c82237ee165baaf1f7e8043a26e0c14417 (diff)
downloadvyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.tar.gz
vyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.zip
stagefiles: simplify & robustify
- avoid all need to pass ".build/" path in stage file names into the functions - add a helper to remove a stage file (required to complete the above properly) - avoid duplicating filenames within scripts which makes them prone to mistakes (some instances of which I've actually encountered and had to fix) Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_memtest')
-rwxr-xr-xscripts/build/binary_memtest7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 6b8e7297b..4b207c6b8 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -29,10 +29,11 @@ fi
Echo_message "Begin installing memtest..."
# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
+Require_stagefile config bootstrap
# Checking stage file
-Check_stagefile .build/binary_memtest
+STAGE_FILE="binary_memtest"
+Check_stagefile "${STAGE_FILE}"
# Acquire lock file
Acquire_lockfile
@@ -109,4 +110,4 @@ then
fi
# Creating stage file
-Create_stagefile .build/binary_memtest
+Create_stagefile "${STAGE_FILE}"