hopefully make tlmgr2 xdvi paper --list work ...

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

1 files changed, 9 insertions, 5 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index 34a95fe4611..0cf6071bdd6 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -154,6 +154,7 @@ my %actionoptions = (
                    "backupdir" => "=s", 
                    "backup" => 1, 
                    "dry-run|n" => 1 },
+  "paper"    =>  { "list" => 1 },
   "install"  =>  { "no-depends" => 1, 
                    "no-depends-at-all" => 1, 
                    "reinstall" => 1,
@@ -245,6 +246,13 @@ if ($opts{"help"}) {
   }
 }
 
+# unify arguments so that the $action contains paper in all cases
+# and push the first arg back to @ARGV for action_paper processing
+if ($action =~ /paper|dvips|xdvi|pdftex|dvipdfmx?|context/) {
+  @ARGV = ($action, @ARGV);
+  $action = "paper";
+}
+  
 # check on supported arguments
 #
 my %suppargs;
@@ -385,11 +393,7 @@ sub execute_action {
     finish(0);
   } elsif ($action =~ m/^remove$/i) {
     merge_into(\%ret, action_remove());
-  } elsif ($action =~ /paper|dvips|xdvi|pdftex|dvipdfmx?|context/) {
-    if ($opts{"gui"}) {
-      action_gui("config");
-    }
-    @ARGV = ($action, @ARGV);
+  } elsif ($action =~ /^paper$/) {
     merge_into(\%ret, action_paper());
   } elsif ($action =~ m/^uninstall$/i) {
     merge_into(\%ret, action_uninstall());