diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-12 01:21:39 +0000 |
---|---|---|
committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-17 18:57:02 +0000 |
commit | 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (patch) | |
tree | 17d1ccea5c085c5afd62361d2fe97a14c951cb9b /scripts/build/bootstrap_cache | |
parent | bea349c82237ee165baaf1f7e8043a26e0c14417 (diff) | |
download | vyos-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/bootstrap_cache')
-rwxr-xr-x | scripts/build/bootstrap_cache | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache index 8f8f4ac4d..b80e6661a 100755 --- a/scripts/build/bootstrap_cache +++ b/scripts/build/bootstrap_cache @@ -29,10 +29,14 @@ then exit 0 fi +# Note, this (plus the applicable extension added below) must match that used in `bootstrap_debootstrap` +STAGE_FILE="bootstrap_cache" + case "${1}" in restore) # Checking stage file - Check_stagefile .build/bootstrap_cache.restore + STAGE_FILE="${STAGE_FILE}.restore" + Check_stagefile "${STAGE_FILE}" if [ -d cache/bootstrap ] then @@ -48,8 +52,8 @@ case "${1}" in cp -a cache/bootstrap chroot # Creating stage file - Create_stagefile .build/bootstrap_cache.restore - Create_stagefile .build/bootstrap + Create_stagefile "${STAGE_FILE}" + Create_stagefile bootstrap exit 0 fi @@ -59,7 +63,8 @@ case "${1}" in Echo_message "Saving bootstrap stage to cache..." # Checking stage file - Check_stagefile .build/bootstrap_cache.save + STAGE_FILE="${STAGE_FILE}.save" + Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -71,6 +76,6 @@ case "${1}" in cp -a chroot cache/bootstrap # Creating stage file - Create_stagefile .build/bootstrap_cache.save + Create_stagefile "${STAGE_FILE}" ;; esac |