From 799d4bfb31c279b72088c8ee8a16c2710ab8a309 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:48 +0200
Subject: Adding live-helper 1.0~a3-1.

---
 helpers/lh_binary_includes | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'helpers/lh_binary_includes')

diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 647ed0bca..6fbaeed41 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -1,6 +1,11 @@
 #!/bin/sh
 
 # lh_binary_includes(1) - copy files into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper 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
 
@@ -10,6 +15,13 @@ do
 	. ${FUNCTION}
 done
 
+# Set static variables
+DESCRIPTION="copy files into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/chroot
@@ -28,14 +40,18 @@ Create_lockfile .lock
 # Checking stage file
 Check_stagefile .stage/binary_includes
 
-if ls /usr/share/live-helper/includes/common/* &> /dev/null
+if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
 then
-	cp -r /usr/share/live-helper/includes/common/* binary
+	cd "${LIVE_INCLUDES}"/common
+	find . | cpio -dmpu "${OLDPWD}"/binary
+	cd "${OLDPWD}"
 fi
 
-if ls /usr/share/live-helper/includes/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
+if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
 then
-	cp -r /usr/share/live-helper/includes/"${LIVE_BINARY_IMAGE}"/* binary
+	cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
+	find . | cpio -dmpu "${OLDPWD}"/binary
+	cd "${OLDPWD}"
 fi
 
 # Creating stage file
-- 
cgit v1.2.3