invert quiet for verbose; change archive output

names to declare their os.


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

1 files changed, 10 insertions, 13 deletions

diff --git a/Master/tlpkg/bin/tl-make-install-pkg b/Master/tlpkg/bin/tl-make-install-pkg
index 506ea6ac870..4a2693dbb69 100755
--- a/Master/tlpkg/bin/tl-make-install-pkg
+++ b/Master/tlpkg/bin/tl-make-install-pkg
@@ -34,25 +34,22 @@ use Getopt::Long;
 $Getopt::Long::autoabbrev=0;
 
 $opt_help=0;
-$opt_quiet=0;
+$opt_verbose=0;
 $opt_outputdir=0;
 
 sub usage {
   print <<'EOF';
 Usage:
-    tl-make-install-pkg [-h|--help] [-q|--quiet] -o|--outputdir=dir
+    tl-make-install-pkg [-h|--help] [-v|--verbose] -o|--outputdir=dir
 
-    tl-make-install-pkg generates a .tar.gz file for UNIX and a .zip file
+    tl-make-install-pkg generates a .tar.gz file for Unix and a .zip file
     for all systems containing all the files needed to install TeX Live
     from the network.
 
     Options:
         -h|--help        Print this message.
-
         -o|--outputdir   Target directory. Must exist and be writable.
-
-        -q|--quiet       Suppress messages.
-
+        -v|--verbose     Extra messages.
 EOF
 ;
   exit 0;
@@ -61,7 +58,7 @@ EOF
 usage if (@ARGV<1);
 
 GetOptions 
-    "quiet|q",
+    "verbose|v",
     "outputdir|o=s",
     "help|h";
 
@@ -96,7 +93,7 @@ die "$tmpdir already exists.\n" if (-d "$tmpdir");
 mkdir "$tmpdir" or die "Can't mkdir \"$tmpdir\".\n";
 mkdir "$inst_tmp" or die "Can't mkdir \"$inst_tmp\".\n";
 
-unless ($opt_quiet) {
+if ($opt_verbose) {
   tllog ($::LOG_NORMAL, "thisdir:      \"$thisdir\"\n");
   tllog ($::LOG_NORMAL, "installerdir: \"$installerdir\"\n");
   tllog ($::LOG_NORMAL, "sys_tmp:      \"$sys_tmp\"\n");
@@ -150,9 +147,9 @@ sub make_zip {
   my $type=shift;
   chdir "$tmpdir" or die "Can't chdir \"$tmpdir\".\n";
   if ($type eq 'zip') {
-    system('zip', '-rq', 'install-tl.zip', 'install-tl'); 
+    system('zip', '-rq', 'install-tl-w32.zip', 'install-tl'); 
   } else {
-    system('tar', '-czf', 'install-tl.tar.gz', 'install-tl'); 
+    system('tar', '-czf', 'install-tl-unx.tar.gz', 'install-tl'); 
   }
   chdir "$installerdir";
 }
@@ -161,9 +158,9 @@ sub make_zip {
 
 sub install_zip {
   copy "$tmpdir/install-tl.tar.gz", "$outputdir";
-  system ('ls', '-l', "$outputdir/install-tl.tar.gz") unless ($opt_qiet);
+  system ('ls', '-l', "$outputdir/install-tl-w32.tar.gz") unless ($opt_qiet);
   copy "$tmpdir/install-tl.zip", "$outputdir";
-  system ('ls', '-l', "$outputdir/install-tl.zip") unless ($opt_qiet);
+  system ('ls', '-l', "$outputdir/install-tl-unx.zip") unless ($opt_qiet);
 }
 
 ### main