From 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 12 Mar 2020 01:21:39 +0000 Subject: 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 --- scripts/build/binary_hdd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/binary_hdd') diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index bc9c61672..507f43563 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -29,10 +29,11 @@ fi Echo_message "Begin building binary hdd image..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap .build/chroot_proc +Require_stagefile config bootstrap chroot_proc # Checking stage file -Check_stagefile .build/binary_hdd +STAGE_FILE="binary_hdd" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -354,4 +355,4 @@ Save_package_cache binary Remove_package # Creating stage file -Create_stagefile .build/binary_hdd +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3