[Debian-live-changes] r1874 - in dists/trunk/live-helper: docs functions helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-29 17:56:46 +0000 (Tue, 29 May 2007)
New Revision: 1874

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/cache.sh
   dists/trunk/live-helper/helpers/lh_binary_local-includes
   dists/trunk/live-helper/helpers/lh_chroot_local-hooks
   dists/trunk/live-helper/helpers/lh_chroot_local-includes
   dists/trunk/live-helper/helpers/lh_chroot_local-packages
   dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
   dists/trunk/live-helper/helpers/lh_chroot_sources
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-05-29 17:56:46 UTC (rev 1874)
@@ -2,6 +2,7 @@
 
 	* helpers/*:
 	  - Added initial P: messages.
+	  - Removed some bashisms.
 	* lists/mini, minimal:
 	  - Removed, already pulled in with live-initramfs depends.
 

Modified: dists/trunk/live-helper/functions/cache.sh
===================================================================
--- dists/trunk/live-helper/functions/cache.sh	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/functions/cache.sh	2007-05-29 17:56:46 UTC (rev 1874)
@@ -32,7 +32,7 @@
 		# Cleaning current cache
 		Chroot "apt-get autoclean"
 
-		if ls chroot/var/cache/apt/archives/*.deb &> /dev/null
+		if ls chroot/var/cache/apt/archives/*.deb > /dev/null 2>&1
 		then
 			# Creating cache directory
 			if [ ! -d "${DIRECTORY}" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/helpers/lh_binary_local-includes	2007-05-29 17:56:46 UTC (rev 1874)
@@ -44,7 +44,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/binary_local-includes/* &> /dev/null
+if ls config/binary_local-includes/* > /dev/null >2&1
 then
 	# Copying includes
 	cd config/binary_local-includes

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-hooks	2007-05-29 17:56:46 UTC (rev 1874)
@@ -45,7 +45,7 @@
 Create_lockfile .lock
 
 # Processing local-hooks
-if ls config/chroot_local-hooks/* &> /dev/null
+if ls config/chroot_local-hooks/* > /dev/null >2&1
 then
 	for HOOK in config/chroot_local-hooks/*
 	do

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-includes	2007-05-29 17:56:46 UTC (rev 1874)
@@ -44,7 +44,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/chroot_local-includes/* &> /dev/null
+if ls config/chroot_local-includes/* > /dev/null >2&1
 then
 	# Copying includes
 	cd config/chroot_local-includes

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packages	2007-05-29 17:56:46 UTC (rev 1874)
@@ -44,7 +44,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/chroot_local-packages/*.deb &> /dev/null
+if ls config/chroot_local-packages/*.deb > /dev/null >2&1
 then
 	# Restoring cache
 	Restore_cache cache/packages_local-packages

Modified: dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packageslists	2007-05-29 17:56:46 UTC (rev 1874)
@@ -44,7 +44,7 @@
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/chroot_local-packageslists/* &> /dev/null
+if ls config/chroot_local-packageslists/* > /dev/null >2&1
 then
 	# Restoring cache
 	Restore_cache cache/packages_local-packageslists

Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-29 17:03:21 UTC (rev 1873)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources	2007-05-29 17:56:46 UTC (rev 1874)
@@ -81,7 +81,7 @@
 		fi
 
 		# Check local sources.list
-		if ls config/chroot_sources/*.bootstrap &> /dev/null
+		if ls config/chroot_sources/*.bootstrap > /dev/null >2&1
 		then
 			echo "" >> chroot/etc/apt/sources.list
 			echo "# Custom repositories" >> chroot/etc/apt/sources.list
@@ -95,12 +95,12 @@
 		# Update indices from cache
 		if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
 		then
-			if ls cache/indices_bootstrap/secring.gpg* &> /dev/null
+			if ls cache/indices_bootstrap/secring.gpg* > /dev/null >2&1
 			then
 				cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
 			fi
 
-			if ls cache/indices_bootstrap/trusted.gpg* &> /dev/null
+			if ls cache/indices_bootstrap/trusted.gpg* > /dev/null >2&1
 			then
 				cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
 			fi
@@ -115,17 +115,17 @@
 				cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
 			fi
 
-			if ls cache/indices_bootstrap/*_Packages &> /dev/null
+			if ls cache/indices_bootstrap/*_Packages > /dev/null >2&1
 			then
 				cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
 			fi
 
-			if ls cache/indices_bootstrap/*_Sources &> /dev/null
+			if ls cache/indices_bootstrap/*_Sources > /dev/null >2&1
 			then
 				cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
 			fi
 
-			if ls cache/indices_bootstrap/*_Release* &> /dev/null
+			if ls cache/indices_bootstrap/*_Release* > /dev/null >2&1
 			then
 				cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
 			fi
@@ -136,7 +136,7 @@
 			fi
 		else # Get fresh indices
 			# Check local gpg keys
-			if ls config/chroot_sources/*.bootstrap.gpg &> /dev/null
+			if ls config/chroot_sources/*.bootstrap.gpg > /dev/null >2&1
 			then
 				for FILE in config/chroot_sources/*.bootstrap.gpg
 				do
@@ -147,7 +147,7 @@
 			fi
 
 			# Check local keyring packages
-			if ls config/chroot_sources/*.deb &> /dev/null
+			if ls config/chroot_sources/*.deb > /dev/null >2&1
 			then
 				for PACKAGE in config/chroot_sources/*.deb
 				do
@@ -257,7 +257,7 @@
 			fi
 
 			# Check local sources.list
-			if ls config/chroot_sources/*.binary &> /dev/null
+			if ls config/chroot_sources/*.binary > /dev/null >2&1
 			then
 				echo "" >> chroot/etc/apt/sources.list
 				echo "# Custom repositories" >> chroot/etc/apt/sources.list
@@ -269,7 +269,7 @@
 			fi
 
 			# Check local gpg keys
-			if ls config/chroot_sources/*.binary.gpg &> /dev/null
+			if ls config/chroot_sources/*.binary.gpg > /dev/null >2&1
 			then
 				for FILE in config/chroot_sources/*.binary.gpg
 				do