From bab27a1b73c636bbfcc90449cf0d46c86f7d3811 Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Wed, 21 Apr 2010 14:07:19 +0000
Subject: [PATCH] Added support for '-f' in installoptionalpackage, which
 removes cached data before displaying the available optional packages that
 can be installed.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36395 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 data/bin/installoptionalpackage | 47 +++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index ef60706181..1682e48861 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -309,7 +309,7 @@ function ErrorExit()
 
 function Init()
 {
-	
+
 	# Set up some directory paths
 	baseDir=`finddir B_COMMON_DATA_DIRECTORY`/optional-packages
 	tmpDir=`finddir B_COMMON_TEMP_DIRECTORY`
@@ -322,16 +322,23 @@ function Init()
 	if ! [ -d ${baseDir} ] ; then
 		mkdir -p ${baseDir}
 	fi
-	
+
+	DetectSystemConfiguration
+	DownloadAllBuildFiles
+	ReadPackageNamesIntoMemory
+}
+
+
+function DownloadAllBuildFiles()
+{
+	# DownloadAllBuildFiles
 	# Retreive the necessary jam files from svn.
 	local buildFiles="OptionalPackages OptionalPackageDependencies \
 		OptionalBuildFeatures"
 	for file in ${buildFiles} ; do
 		GetBuildFile ${file}
 	done
-
-	DetectSystemConfiguration
-	ReadPackageNamesIntoMemory
+	
 }
 
 
@@ -688,14 +695,33 @@ Disclaimer:
     http://dev.haiku-os.org/wiki/PackageManagerIdeas
     http://dev.haiku-os.org/wiki/PackageFormat
 
-Usage: ./installoptionalpackage [-l] [-a "<pkg> [<pkg> ...]"]
--l      List installable packages
+Usage: ./installoptionalpackage [-f] [-h] [-l] [-a "<pkg> [<pkg> ...]"]
 -a      Add one or more packages and all dependencies
+-f		Remove cached data and list installable packages
+-h		Print this help.
+-l      List installable packages
 
 EOF
 }
 
 
+function RemoveCachedFiles()
+{
+	# RemoveCachedFiles
+	echo "Removing cached files ..."
+	if [ -d ${baseDir} ]; then
+		rm -rf ${baseDir}
+	fi
+	
+	# Unset variables, which prevents duplicate entries.
+	declare -A availablePackages
+	declare availablePackagesKeys=""
+	
+	# Reinitialize
+	Init
+}
+
+
 function ListPackages()
 {
 	# ListPackages
@@ -722,12 +748,17 @@ else
 fi
 
 # Parse the arguments given to the script.
-while getopts "a:lh" opt; do
+while getopts "a:fhl" opt; do
 	case $opt in
 		a)
 			AddPackage "$OPTARG"
 			exit 0
 			;;
+		f)
+			RemoveCachedFiles
+			ListPackages
+			exit 0
+			;;
 		h)
 			DisplayUsage
 			exit 0