From e414b342999131a46b42b72699be9a1f9359ea6a Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Mon, 1 Mar 2010 22:13:12 +0000
Subject: [PATCH] Added support for *.tgz,*.tar.gz. It is now consistent with
 InstallOptionalHaikuImagePackage's functionality.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35711 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 data/bin/installoptionalpackage | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index a081e9406d..17af4a8a53 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -121,8 +121,8 @@ function InstallOptionalHaikuImagePackage()
 	echo "Installing \$1 ..."
 	cd \$tmpDir
 	
-	zipFile=\`echo \$3 | sed -s "s/http.*\///"\`
-	if ! [ -f \$zipFile ] ; then
+	archiveFile=\`echo \$3 | sed -s "s/http.*\///"\`
+	if ! [ -f \$archiveFile ] ; then
 		echo "Downloading \$3 ..."
 		wget -nv \$3
 	fi
@@ -142,14 +142,26 @@ function InstallOptionalHaikuImagePackage()
 			fi
 		fi
 	done
-	echo "Unzipping \$zipFile ..."
-	unzipDir="\${dirTokens}"
-	unzip -q -o  -d "\$unzipDir" "\$zipFile"
+	echo "Extracting \$archiveFile ..."
+	extractDir="\${dirTokens}"
+	
+	case "\$archiveFile" in
+		*.zip)
+			unzip -q -o -d "\$extractDir" "\$archiveFile"
+			;;
+		*.tgz|*.tar.gz)
+			tar -C "\$extractDir" -xf "\$archiveFile"
+			;;
+		*)
+			echo "Unhandled archive extension in InstallOptionalHaikuImagePackage()"
+			exit 1
+			;;
+	esac
 	
 	if [ -f '/boot/.OptionalPackageDescription' ] ; then
 		rm '/boot/.OptionalPackageDescription'
 	fi
-	rm "\$zipFile"
+	rm "\$archiveFile"
 }