output option identifiers as well as descriptions

git-svn-id: svn://tug.org/texlive/trunk@11613 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 58 insertions, 24 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 148faf4e3af..f2077f77716 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1603,6 +1603,7 @@ sub action_list {
   return;
 }
 
+
 sub action_option {
   if ($opt_gui) {
     action_gui("config");
@@ -1636,37 +1637,53 @@ sub action_option {
     # changes the default docfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"), " install documentation files!\n";
+      print "Defaulting to", ($loc ? "" : " not"),
+            " installing documentation files.\n";
       $localtlpdb->option_install_docfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install documentation files: ", $localtlpdb->option_install_docfiles, "\n";
+      print "Install documentation files: ",
+            $localtlpdb->option_install_docfiles, "\n";
     }
   } elsif ($what =~ m/^srcfiles$/i) {
     # changes the default srcfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"), " install source files!\n";
+      print "Defaulting to", ($loc ? "" : " not"),
+            " installing source files.\n";
       $localtlpdb->option_install_srcfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install source files: ", $localtlpdb->option_install_srcfiles, "\n";
+      print "Install source files: ",
+            $localtlpdb->option_install_srcfiles, "\n";
     }
   } elsif ($what =~ m/^formats$/i) {
     # changes the default formats
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"), " generate format files on installation!\n";
+      print "Defaulting to", ($loc ? "" : " not"),
+            " generating format files on installation.\n";
       $localtlpdb->option_create_formats($loc);
       $localtlpdb->save;
     } else {
-      print "Create formats on installation: ", $localtlpdb->option_create_formats, "\n";
+      print "Create formats on installation: ",
+            $localtlpdb->option_create_formats, "\n";
     }
   } elsif ($what =~ m/^show$/i) {
-    print "Default installation location:  ", $localtlpdb->option_location, "\n";
-    print "Create formats on installation: ", ($localtlpdb->option_create_formats ? "yes": "no"), "\n";
-    print "Install documentation files:    ", ($localtlpdb->option_install_docfiles ? "yes": "no"), "\n";
-    print "Install source files:           ", ($localtlpdb->option_install_srcfiles ? "yes": "no"), "\n";
+    print "Default installation location (location): ",
+          $localtlpdb->option_location, "\n";
+    print "Create formats on installation (formats): ", 
+          ($localtlpdb->option_create_formats ? "yes" : "no"), "\n";
+    print "Install documentation files (docfiles):   ",
+          ($localtlpdb->option_install_docfiles ? "yes": "no"), "\n";
+    print "Install source files (srcfiles):          ",
+          ($localtlpdb->option_install_srcfiles ? "yes": "no"), "\n";
+    print "Directory for backups (backupdir):        ",
+          $localtlpdb->option("backupdir"), "\n"
+      if $localtlpdb->option("backupdir");
+    print "Number of backups to keep (autobackup):   ",
+          $localtlpdb->option("autobackup"), "\n"
+      if $localtlpdb->option("autobackup");
   } else {
     my $val = shift @ARGV;
     if (defined($val)) {
@@ -2721,8 +2738,8 @@ Possible values for I<key> are:
  C<formats> (create formats at installation time),
  C<docfiles> (install documentation files),
  C<srcfiles> (install source files),
- C<autobackup> (number of backups to be kept),
- C<backupdir> (default directory for backups).
+ C<backupdir> (default directory for backups),
+ C<autobackup> (number of backups to keep).
 
 Perhaps the most common use of C<option> is if you originally installed from
 DVD, and want to permanently change the installation to get further
diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index 56fd13622e2..4828226870b 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -1738,6 +1738,7 @@ sub action_list {
   return;
 }
 
+
 sub action_option {
   if ($opt_gui) {
     action_gui("config");
@@ -1771,37 +1772,53 @@ sub action_option {
     # changes the default docfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"), " install documentation files!\n";
+      print "Defaulting to", ($loc ? "" : " not"),
+            " installing documentation files.\n";
       $localtlpdb->option_install_docfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install documentation files: ", $localtlpdb->option_install_docfiles, "\n";
+      print "Install documentation files: ",
+            $localtlpdb->option_install_docfiles, "\n";
     }
   } elsif ($what =~ m/^srcfiles$/i) {
     # changes the default srcfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"), " install source files!\n";
+      print "Defaulting to", ($loc ? "" : " not"),
+            " installing source files.\n";
       $localtlpdb->option_install_srcfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install source files: ", $localtlpdb->option_install_srcfiles, "\n";
+      print "Install source files: ",
+            $localtlpdb->option_install_srcfiles, "\n";
     }
   } elsif ($what =~ m/^formats$/i) {
     # changes the default formats
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"), " generate format files on installation!\n";
+      print "Defaulting to", ($loc ? "" : " not"),
+            " generating format files on installation.\n";
       $localtlpdb->option_create_formats($loc);
       $localtlpdb->save;
     } else {
-      print "Create formats on installation: ", $localtlpdb->option_create_formats, "\n";
+      print "Create formats on installation: ",
+            $localtlpdb->option_create_formats, "\n";
     }
   } elsif ($what =~ m/^show$/i) {
-    print "Default installation location:  ", $localtlpdb->option_location, "\n";
-    print "Create formats on installation: ", ($localtlpdb->option_create_formats ? "yes": "no"), "\n";
-    print "Install documentation files:    ", ($localtlpdb->option_install_docfiles ? "yes": "no"), "\n";
-    print "Install source files:           ", ($localtlpdb->option_install_srcfiles ? "yes": "no"), "\n";
+    print "Default installation location (location): ",
+          $localtlpdb->option_location, "\n";
+    print "Create formats on installation (formats): ", 
+          ($localtlpdb->option_create_formats ? "yes" : "no"), "\n";
+    print "Install documentation files (docfiles):   ",
+          ($localtlpdb->option_install_docfiles ? "yes": "no"), "\n";
+    print "Install source files (srcfiles):          ",
+          ($localtlpdb->option_install_srcfiles ? "yes": "no"), "\n";
+    print "Directory for backups (backupdir):        ",
+          $localtlpdb->option("backupdir"), "\n"
+      if $localtlpdb->option("backupdir");
+    print "Number of backups to keep (autobackup):   ",
+          $localtlpdb->option("autobackup"), "\n"
+      if $localtlpdb->option("autobackup");
   } else {
     my $val = shift @ARGV;
     if (defined($val)) {
@@ -2891,8 +2908,8 @@ Possible values for I<key> are:
  C<formats> (create formats at installation time),
  C<docfiles> (install documentation files),
  C<srcfiles> (install source files),
- C<autobackup> (number of backups to be kept),
- C<backupdir> (default directory for backups).
+ C<backupdir> (default directory for backups),
+ C<autobackup> (number of backups to keep).
 
 Perhaps the most common use of C<option> is if you originally installed from
 DVD, and want to permanently change the installation to get further