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_loopback_cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/binary_loopback_cfg') diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 62681603a..032d8d28e 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -28,10 +28,11 @@ Init_config_data "${@}" Echo_message "Begin installing loopback.cfg..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap # Checking stage file -Check_stagefile .build/binary_loopback_cfg +STAGE_FILE="binary_loopback_cfg" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -301,4 +302,4 @@ sed -i -e 's|\ $||g' binary/boot/grub/*.cfg echo "source /boot/grub/grub.cfg" > binary/boot/grub/loopback.cfg # Creating stage file -Create_stagefile .build/binary_loopback_cfg +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3