r2682 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-04 16:51:54 +0000 (Sat, 04 Aug 2007)
New Revision: 2682

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
   dists/trunk/live-helper/helpers/lh_binary_includes
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-04 16:37:05 UTC (rev 2681)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-04 16:51:54 UTC (rev 2682)
@@ -4,6 +4,8 @@
 	  - Renaming LIVE_* variables to LH_*.
 	* excamples/cron/*:
 	  - Updated to make-live removal.
+	* helpers/lh_binary_debian-installer, lh_binary_includes:
+	  - Fixed some bashisms.
 	* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
 	  - Workaround from matth over /bin/echo to avoid wrong expansion
 	    of entries when using dash (Closes: #431748).

Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-08-04 16:37:05 UTC (rev 2681)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-08-04 16:51:54 UTC (rev 2682)
@@ -261,7 +261,7 @@
 fi
 
 # Including local debs
-if ls ../config/binary_local-debs/* &> /dev/null
+if ls ../config/binary_local-debs/* > /dev/null 2>&1
 then
 	for FILE in ../config/binary_local-debs/*.deb
 	do
@@ -330,7 +330,7 @@
 cp *.udeb ../cache/packages_debian-installer.udeb
 
 # Including local udebs
-if ls ../config/binary_local-udebs/* &> /dev/null
+if ls ../config/binary_local-udebs/* > /dev/null 2>&1
 then
 	for FILE in ../config/binary_local-udebs/*.udeb
 	do

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-08-04 16:37:05 UTC (rev 2681)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-08-04 16:51:54 UTC (rev 2682)
@@ -92,26 +92,26 @@
 
 # Copying common templates
 if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* &> /dev/null
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* > /dev/null 2>&1
 then
 	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* binary
 fi
 
 if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}" ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* &> /dev/null
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* > /dev/null 2>&1
 then
 	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* binary
 fi
 
 # Copying live templates
 if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* &> /dev/null
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* > /dev/null 2>&1
 then
 	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* binary
 fi
 
 if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}" ] && \
-ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* > /dev/null 2>&1
 then
 	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
 fi
@@ -120,13 +120,13 @@
 then
 	# Copying install templates
 	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
-	ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* &> /dev/null
+	ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* > /dev/null 2>&1
 	then
 		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
 	fi
 
 	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
-	ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+	ls "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* > /dev/null 2>&1
 	then
 		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
 	fi