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/chroot_resolv | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/build/chroot_resolv') diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv index 174b9d598..d550fea35 100755 --- a/scripts/build/chroot_resolv +++ b/scripts/build/chroot_resolv @@ -22,14 +22,16 @@ USAGE="${PROGRAM} {install|remove} [--force]" Init_config_data "${@}" # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap + +STAGE_FILE="chroot_resolv" case "${1}" in install) Echo_message "Configuring file /etc/resolv.conf" # Checking stage file - Check_stagefile .build/chroot_resolv + Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -58,7 +60,7 @@ case "${1}" in fi # Creating stage file - Create_stagefile .build/chroot_resolv + Create_stagefile "${STAGE_FILE}" ;; remove) @@ -89,7 +91,7 @@ case "${1}" in fi # Removing stage file - rm -f .build/chroot_resolv + Remove_stagefile "${STAGE_FILE}" ;; *) -- cgit v1.2.3