Some improvements for installoptionalpackage

* copy the needed jam files during compile time. This ensures the correct data
 files are used, for example in non-trunk builds
 * -f now only removes the generated at runtime listing of available packages


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37465 a95241bf-73f2-0310-859d-f6bbb57e9c96

data/bin/installoptionalpackage

@@ -43,7 +43,6 @@ declare alreadyInstalled=""
 # as they require either the source code or compiled binaries
 declare packageIgnoreList="Bluetooth Development DevelopmentMin \
 DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData "
-installedPackagesFile="`finddir B_COMMON_DATA_DIRECTORY`/InstalledPackages"
 
 
 function CreateInstallerScript()
@@ -337,6 +336,8 @@ function Init()
 	tmpDir=`finddir B_COMMON_TEMP_DIRECTORY`
 	libDir=`finddir B_SYSTEM_LIB_DIRECTORY`
 
+	installedPackagesFile="${baseDir}/InstalledPackages"
+
 	# Make sure these files are empty.
 	echo "" > ${tmpDir}/optpkg.jam
 	echo "" > ${tmpDir}/optpkg.stage1
@@ -783,8 +784,8 @@ function RemoveCachedFiles()
 {
 	# RemoveCachedFiles
 	echo "Removing cached files ..."
-	if [ -d ${baseDir} ]; then
-		rm -rf ${baseDir}
+	if [ -e ${baseDir}/OptionalPackageNames ]; then
+		rm ${baseDir}/OptionalPackageNames
 	fi
 
 	# Unset variables, which prevents duplicate entries.