Refactored packaging script creating temporary patched scripts instead of changing committed scripts

Previously running the build with a custom BUILDPREFIX would cause files committed to the repository to be changed.

Now they are copied to a patched- prefixed version.

Ticket: ENT-9880
Changelog: none

Author: craigcomstock

build-scripts/package

@@ -118,12 +118,14 @@ P="$BASEDIR/buildscripts/packaging/$PKG"
 if [ "$BUILDPREFIX" != /var/cfengine ]; then
     log_debug "Custom prefix detected: $BUILDPREFIX"
     safe_prefix="$(echo "$BUILDPREFIX" | sed -e 's:/::g')"
-    file_to_patch=$P/../common/script-templates/$PACKAGING-script-common.sh
-    if [ -f "$file_to_patch" ]; then
-        # Update installation scripts to use custom prefix
-        log_debug "Patching script template: $file_to_patch"
-        sed "s:/var/cfengine:$BUILDPREFIX:" "$file_to_patch" >"$file_to_patch".new
-        mv "$file_to_patch".new "$file_to_patch"
+    source_script=$P/../common/script-templates/$PACKAGING-script-common.sh
+    patched_script=$P/../common/script-templates/patched-$PACKAGING-script-common.sh
+    if [ -f "$source_script" ]; then
+        # Patch installation scripts for custom prefix, create patched-$PACKAGING-script-common.sh which is not version tracked
+        log_debug "Patching from source: $source_script to patched script: $patched_script"
+        sed "s:/var/cfengine:$BUILDPREFIX:" "$source_script" >"$patched_script"
+    else
+        log_error "Source $PACKAGING-script-common.sh not available at $source_script"
     fi
 else
     log_debug "Using default prefix: /var/cfengine"

packaging/common/produce-script

@@ -7,7 +7,8 @@
 # action = <install|remove>
 #
 # script-header.sh
-# <type>-script-common.sh
+# patched-<type>-script-common.sh
+# note: patched- prefix files are not to be committed to the repository and are generated by build-scripts/package script
 # <type>-script-common-<action>.sh
 # script-common.sh
 # script-common-<action>.sh
@@ -35,7 +36,7 @@ include_script()
 }
 
 include_script "$TEMPLATEDIR/script-header.sh"
-include_script "$TEMPLATEDIR/$PKG_TYPE-script-common.sh"
+include_script "$TEMPLATEDIR/patched-$PKG_TYPE-script-common.sh"
 
 case "$PKG_TYPE" in
     deb|rpm)
@@ -57,13 +58,13 @@ echo "LMDB_VERSION=$LMDB_VERSION"
 
 case "$SCRIPT_TYPE" in
   *install)
-    include_script "$TEMPLATEDIR/$PKG_TYPE-script-common-install.sh"
+    include_script "$TEMPLATEDIR/patched-$PKG_TYPE-script-common-install.sh"
     include_script "$TEMPLATEDIR/script-common.sh"
     include_script "$TEMPLATEDIR/script-common-install.sh"
     include_script "$TEMPLATEDIR/script-common-$SCRIPT_TYPE.sh"
     ;;
   *remove)
-    include_script "$TEMPLATEDIR/$PKG_TYPE-script-common-remove.sh"
+    include_script "$TEMPLATEDIR/patched-$PKG_TYPE-script-common-remove.sh"
     include_script "$TEMPLATEDIR/script-common.sh"
     include_script "$TEMPLATEDIR/script-common-remove.sh"
     include_script "$TEMPLATEDIR/script-common-$SCRIPT_TYPE.sh"