* cmdline options are now collected in a hash instead of individual variables,

  as this is much clearer

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1527 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 7 insertions, 18 deletions

diff --git a/installer/slxos-setup b/installer/slxos-setup
index 6777ec4d..84b90301 100755
--- a/installer/slxos-setup
+++ b/installer/slxos-setup
@@ -36,27 +36,21 @@ use OpenSLX::Basics;
 use OpenSLX::OSSetup::Engine;
 use OpenSLX::Utils;
 
-my (
-	$helpReq,
-	$manReq,
-	$verbose,
-	$versionReq,
-);
+my %option;
 
 GetOptions(
-	'help|?' => \$helpReq,
-	'man' => \$manReq,
-	'verbose' => \$verbose,
-	'version' => \$versionReq,
+	'help|?'  => \$option{helpReq},
+	'man'     => \$option{manReq},
+	'version' => \$option{versionReq},
 ) or pod2usage(2);
-pod2usage(-msg => $abstract, -verbose => 0, -exitval => 1) if $helpReq;
-if ($manReq) {
+pod2usage(-msg => $abstract, -verbose => 0, -exitval => 1) if $option{helpReq};
+if ($option{manReq}) {
 	# avoid dubious problem with perldoc in combination with UTF-8 that
 	# leads to strange dashes and single-quotes being used
 	$ENV{LC_MESSAGES} = 'POSIX';
 	pod2usage(-verbose => 2)
 }
-if ($versionReq) {
+if ($option{versionReq}) {
 	system('slxversion');
 	exit 1;
 }
@@ -196,7 +190,6 @@ slxos-setup [options] <action> <action-params> ...
 
     --help          brief help message
     --man           show full documentation
-    --verbose       show more information during execution
     --version       show version
 
 =head3 Actions
@@ -265,10 +258,6 @@ Prints a brief help message and exits.
 
 Prints the manual page and exits.
 
-=item B<--verbose>
-
-Prints more information during execution of any action.
-
 =item B<--version>
 
 Prints the version and exits.