[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. e1dfcce903b7936cac3958e7a90a9dcb7addc3b2

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 31ba24c76056f278a242b344038c5c9f4441ba2b
Author: Steffen Moeller <moeller at debian.org>
Date:   Thu Mar 19 17:27:22 2009 +0100

    Hardening installation of GNU tar
    
     * already existing / left over data.tar.gz file is removed
     * ( )s removed so an error will not remain unnoticed

diff --git a/install.sh b/install.sh
index 3129466..896accc 100755
--- a/install.sh
+++ b/install.sh
@@ -464,7 +464,7 @@ action_testing () {
 	fi
 	echo " * microSD card device: $SD_DEVICE present"
 
-	for intern_binary in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS mkswap gunzip dd sed rdate ar; do
+	for intern_binary in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS mkswap gunzip dd sed rdate ar pwd; do
 		if ! which $intern_binary > /dev/null; then
 			echo "E: Could not find $intern_binary binary"
 			exit 1
@@ -478,11 +478,20 @@ action_testing () {
 		echo "W: tar does not support gzip archives"
 		echo "Downloading tar package"
 		wget $TAR_PACKAGE -O /tmp/tar.deb
-		( cd /tmp && ar -x tar.deb data.tar.gz )
+		cwd=`pwd`
+		cd /tmp
+		if [ -f data.tar.gz ]; then
+			if [ -n "$VERBOSE" ]; then
+				echo "I: removing previous /tmp/data.tar.gz"
+			fi
+			rm -f data.tar.gz
+		fi
+		ar -x tar.deb data.tar.gz
 		mkdir -p /usr/local
-		gunzip -c /tmp/data.tar.gz | tar -x -C /usr/local/
-		rm -f /tmp/data.tar.gz
-		rm -f /tmp/tar.deb
+		gunzip -c data.tar.gz | tar -x -C /usr/local/
+		rm -f data.tar.gz
+		rm -f tar.deb
+		cd "$cwd"
 	fi
 
 	if [ "$SD_PART1_FS" = "vfat" ]; then

-- 
Various non-packaged files