From 888c43863b45760099173af451b529ea14a8a3fb Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Sat, 15 May 2010 03:55:58 +0000
Subject: [PATCH] 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
---
 data/bin/installoptionalpackage | 53 ++++++++++++++-------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index e72c35eeeb..f85c85cbbb 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -13,17 +13,27 @@
 #	information, the user will be limited to the appropriate OptionalPackages
 #	that were available for that specific revision.
 #
-# Disclaimer:
-#   This is a temporary solution for installing OptionalPackages.
-#   In time, there will be an official package manager.
-#   See these URL's for info on the in-development package manager.
-#     http://dev.haiku-os.org/wiki/PackageManagerIdeas
-#     http://dev.haiku-os.org/wiki/PackageFormat
-#
-# Usage: ./installoptionalpackage [-l] [-a "<pkg> [<pkg> ...]"]
-# -l      List installable packages
-# -a      Add one or more packages and all dependencies
+DISCLAIMER="\
+Disclaimer:\n\
+  This is a temporary solution for installing OptionalPackages.\n\
+  In time, there will be an official package manager.\n\
+  See these URL's for information on the in-development package manager.\n\
+    http://dev.haiku-os.org/wiki/PackageManagerIdeas\n\
+    http://dev.haiku-os.org/wiki/PackageFormat\n\
+	"
 
+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 availablePackagesKeys=""
@@ -722,27 +732,8 @@ function ReplaceComparators()
 
 function DisplayUsage()
 {
-	cat << EOF
-
-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
+	echo -e "$DISCLAIMER"
+	echo -e "$USAGE"
 }