Replaces the commented disclaimer & usage with a variable declaration, which is

echo'd in DisplayUsage.  No functional change.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36817 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-15 03:55:58 +00:00
parent 9a708202ac
commit 888c43863b
+22 -31
View File
@@ -13,17 +13,27 @@
# information, the user will be limited to the appropriate OptionalPackages # information, the user will be limited to the appropriate OptionalPackages
# that were available for that specific revision. # that were available for that specific revision.
# #
# Disclaimer: DISCLAIMER="\
# This is a temporary solution for installing OptionalPackages. Disclaimer:\n\
# In time, there will be an official package manager. This is a temporary solution for installing OptionalPackages.\n\
# See these URL's for info on the in-development package manager. In time, there will be an official package manager.\n\
# http://dev.haiku-os.org/wiki/PackageManagerIdeas See these URL's for information on the in-development package manager.\n\
# http://dev.haiku-os.org/wiki/PackageFormat http://dev.haiku-os.org/wiki/PackageManagerIdeas\n\
# http://dev.haiku-os.org/wiki/PackageFormat\n\
# Usage: ./installoptionalpackage [-l] [-a "<pkg> [<pkg> ...]"] "
# -l List installable packages
# -a Add one or more packages and all dependencies
USAGE="\
Usage: ./installoptionalpackage [<pkg> [<pkg> ...]]\n\
or ./installoptionalpackage [-a|-s <pkg> [<pkg> ...]]\n\
or ./installoptionalpackage [-f|-h|-l]\n\
\n\
Options:\n\
-a Add one or more packages and all dependencies\n\
-s Show the final list of packages that would be installed\n\
-f Remove cached data and list installable packages\n\
-h Print this help.\n\
-l List installable packages\n\
"
declare -A availablePackages declare -A availablePackages
declare availablePackagesKeys="" declare availablePackagesKeys=""
@@ -722,27 +732,8 @@ function ReplaceComparators()
function DisplayUsage() function DisplayUsage()
{ {
cat << EOF echo -e "$DISCLAIMER"
echo -e "$USAGE"
Disclaimer:
This is a temporary solution for installing OptionalPackages.
In time, there will be an official package manager.
See these URL's for information on the in-development package manager.
http://dev.haiku-os.org/wiki/PackageManagerIdeas
http://dev.haiku-os.org/wiki/PackageFormat
Usage: ./installoptionalpackage [<pkg> [<pkg> ...]]
or ./installoptionalpackage [-a|-s <pkg> [<pkg> ...]]
or ./installoptionalpackage [-f|-h|-l]
Options:
-a Add one or more packages and all dependencies
-s Show the final list of packages that would be installed
-f Remove cached data and list installable packages
-h Print this help.
-l List installable packages
EOF
} }