X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=bin%2Flive-snapshot;h=3d4efad0da20bdb3c9adcb8f26083b7013b9403d;hb=76000a06a9da1771e5a759e98f863cea6ca5271e;hp=5a7b97903b3fc3ec15a3a352dbff8db2ded95dc2;hpb=6fd3b2db8ca683513709560744aebd4cff3d378d;p=live-boot-grml.git

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 5a7b979..3d4efad 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -341,13 +341,13 @@ Entry_is_modified ()
 
 Do_filelist ()
 {
-	# BUGS: supports only cpio.gz types, and do not handle deleted files yet
+	# BUGS: supports only cpio.gz types, and does not handle deleted files yet
 
 	TMP_FILELIST=$1
 	if [ -f "${SNAP_LIST}" ]
 	then
-		# Generate include list
-		for entry in $(cat "${SNAP_LIST}" | grep -v '^#.*$' | grep -v '^ *$')
+		# Generate include list removing empty and commented lines
+		for entry in $(sed -e '/^ *$/d' -e '/^#.*$/d' "${SNAP_LIST}")
 		do
 			if [ -d "${entry}" ]
 			then
@@ -397,7 +397,7 @@ Do_snapshot ()
 			if [ -e "${EXCLUDE_LIST}" ]
 			then
 				# Add explicitly excluded files
-				cat "${EXCLUDE_LIST}" | grep -v '^#.*$' | grep -v '^ *$' >> "${TMP_FILELIST}"
+				grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' >> "${TMP_FILELIST}"
 			fi
 
 			cd "${OLDPWD}"
@@ -411,14 +411,24 @@ Do_snapshot ()
 			then
 				# Convert \0 to \n and tag existing (rare but possible) \n in filenames,
 				# this to let grep -F -v do a proper work in filtering out
-				cat "${TMP_FILELIST}" | tr '\n' '\1' | tr '\0' '\n' | grep -F -v -f "${EXCLUDE_LIST}" | tr '\n' '\0' | tr '\1' '\n' | cpio --quiet -o0 -H newc | gzip -9c > "${DEST}" || exit 1
+				cat "${TMP_FILELIST}" | \
+					tr '\n' '\1' | \
+					tr '\0' '\n' | \
+					grep -F -v -f "${EXCLUDE_LIST}" | \
+					tr '\n' '\0' | \
+					tr '\1' '\n' | \
+					cpio --quiet -o0 -H newc | \
+					gzip -9c > "${DEST}" || exit 1
 			else
-				cat "${TMP_FILELIST}" | cpio --quiet -o0 -H newc | gzip -9c > "${DEST}" || exit 1
+				cat "${TMP_FILELIST}" | \
+					cpio --quiet -o0 -H newc | \
+					gzip -9c > "${DEST}" || exit 1
 			fi
 			cd "${OLDPWD}"
 			;;
 
-		# ext2|ext3 and jffs2 does not support easely an exclude list, files should be copied in another directory in order to filter content
+		# ext2|ext3 and jffs2 does not easily support an exclude list; files
+		# should be copied to another directory in order to filter content
 		ext2|ext3)
 			DU_DIM="$(du -ks ${SNAP_COW} | cut -f1)"
 			REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here...