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
This commit is contained in:
@@ -323,6 +323,15 @@ function Init()
|
|||||||
mkdir -p ${baseDir}
|
mkdir -p ${baseDir}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
DetectSystemConfiguration
|
||||||
|
DownloadAllBuildFiles
|
||||||
|
ReadPackageNamesIntoMemory
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function DownloadAllBuildFiles()
|
||||||
|
{
|
||||||
|
# DownloadAllBuildFiles
|
||||||
# Retreive the necessary jam files from svn.
|
# Retreive the necessary jam files from svn.
|
||||||
local buildFiles="OptionalPackages OptionalPackageDependencies \
|
local buildFiles="OptionalPackages OptionalPackageDependencies \
|
||||||
OptionalBuildFeatures"
|
OptionalBuildFeatures"
|
||||||
@@ -330,8 +339,6 @@ function Init()
|
|||||||
GetBuildFile ${file}
|
GetBuildFile ${file}
|
||||||
done
|
done
|
||||||
|
|
||||||
DetectSystemConfiguration
|
|
||||||
ReadPackageNamesIntoMemory
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -688,14 +695,33 @@ Disclaimer:
|
|||||||
http://dev.haiku-os.org/wiki/PackageManagerIdeas
|
http://dev.haiku-os.org/wiki/PackageManagerIdeas
|
||||||
http://dev.haiku-os.org/wiki/PackageFormat
|
http://dev.haiku-os.org/wiki/PackageFormat
|
||||||
|
|
||||||
Usage: ./installoptionalpackage [-l] [-a "<pkg> [<pkg> ...]"]
|
Usage: ./installoptionalpackage [-f] [-h] [-l] [-a "<pkg> [<pkg> ...]"]
|
||||||
-l List installable packages
|
|
||||||
-a Add one or more packages and all dependencies
|
-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
|
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()
|
function ListPackages()
|
||||||
{
|
{
|
||||||
# ListPackages
|
# ListPackages
|
||||||
@@ -722,12 +748,17 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Parse the arguments given to the script.
|
# Parse the arguments given to the script.
|
||||||
while getopts "a:lh" opt; do
|
while getopts "a:fhl" opt; do
|
||||||
case $opt in
|
case $opt in
|
||||||
a)
|
a)
|
||||||
AddPackage "$OPTARG"
|
AddPackage "$OPTARG"
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
|
f)
|
||||||
|
RemoveCachedFiles
|
||||||
|
ListPackages
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
h)
|
h)
|
||||||
DisplayUsage
|
DisplayUsage
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
Reference in New Issue
Block a user