From fb2bc99fd5f02cf87061159184640505bc428c5a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 19 Jul 2011 19:03:01 +0200
Subject: Reworking binary hooks helper.

---
 scripts/build/lb_binary_hooks       | 72 +++++++++++++++++++++++++++++++++++++
 scripts/build/lb_binary_local-hooks | 58 ------------------------------
 2 files changed, 72 insertions(+), 58 deletions(-)
 create mode 100755 scripts/build/lb_binary_hooks
 delete mode 100755 scripts/build/lb_binary_local-hooks

(limited to 'scripts/build')

diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks
new file mode 100755
index 000000000..32cf5a089
--- /dev/null
+++ b/scripts/build/lb_binary_hooks
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+##
+## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute hooks in binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+## Processing distribution hooks
+
+# Running hooks
+for _HOOK in ${LB_BINARY_HOOKS}
+do
+	if [ -e "${LB_BASE}/hooks/???-${_HOOK}.binary" ]
+	then
+		cd binary
+		./"${LB_BASE}/hooks/???-${_HOOK}.binary" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+		cd "${OLDPWD}"
+	fi
+done
+
+## Processing local hooks
+
+if Find_files config/hooks/*.binary
+then
+	for HOOK in config/hooks/*.binary
+	do
+		# Making hook executable
+		if [ ! -x "${HOOK}" ]
+		then
+			chmod +x "${HOOK}"
+		fi
+
+		# Executing hook
+		./"${HOOK}" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+	done
+
+	# Creating stage file
+	Create_stagefile .stage/binary_hooks
+fi
diff --git a/scripts/build/lb_binary_local-hooks b/scripts/build/lb_binary_local-hooks
deleted file mode 100755
index f9a8f61a3..000000000
--- a/scripts/build/lb_binary_local-hooks
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute local hooks in binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing local hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing local-hooks
-if Find_files config/hooks/*.binary
-then
-	for HOOK in config/hooks/*.binary
-	do
-		# Making hook executable
-		if [ ! -x "${HOOK}" ]
-		then
-			chmod +x "${HOOK}"
-		fi
-
-		# Executing hook
-		./"${HOOK}" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/binary_local-hooks
-fi
-- 
cgit v1.2.3