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/chroot_apt | |
| 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/chroot_apt')
| -rwxr-xr-x | scripts/build/chroot_apt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 6aee8ccdd..7d165dcf5 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -22,14 +22,16 @@ USAGE="${PROGRAM} {install|install-binary|remove} [--force]" Init_config_data "${@}" # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap + +STAGE_FILE="chroot_apt" case "${1}" in install|install-binary) Echo_message "Configuring file /etc/apt/apt.conf" # Checking stage file - Check_stagefile .build/chroot_apt + Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -205,7 +207,7 @@ EOF esac # Creating stage file - Create_stagefile .build/chroot_apt + Create_stagefile "${STAGE_FILE}" ;; remove) @@ -303,7 +305,7 @@ EOF fi # Removing stage file - rm -f .build/chroot_apt + Remove_stagefile "${STAGE_FILE}" ;; *) |