Bug fixed.

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

2 files changed, 24 insertions, 6 deletions

diff --git a/Build/source/texk/texlive/getnonfreefonts b/Build/source/texk/texlive/getnonfreefonts
index 4e71eeeaa69..f91af05f4f5 100644
--- a/Build/source/texk/texlive/getnonfreefonts
+++ b/Build/source/texk/texlive/getnonfreefonts
@@ -34,7 +34,7 @@ Usage:
     Options:
         -a|--all      Install all fonts.
 
-        -d|--debug    Provide additional messages for debugging..
+        -d|--debug    Provide additional messages for debugging.
 
         -f|--force    Install fonts even if they are installed already.
 	
@@ -60,6 +60,7 @@ GetOptions
     "help|h",
     "lsfonts|l",
     "verbose|v",
+    "version",
     "sys";
 
 $^W=1 if $opt_debug;
@@ -116,13 +117,15 @@ if ($opt_debug) {
     }
 }
 
+print "$TL_version\n" and exit 0 if $opt_version; 
+
 
 if (defined $ENV{'TMP'}) {
     $SYSTMP="$ENV{'TMP'}";
 } elsif (defined $ENV{'TEMP'}) {
     $SYSTMP="$ENV{'TEMP'}";
 } elsif (defined $ENV{'TMPDIR'}) {
-    $SYSTMP="$ENV{'SYSTMP'}";
+    $SYSTMP="$ENV{'TMPDIR'}";
 } else {
     $SYSTMP="/tmp";
 }
@@ -159,9 +162,9 @@ if ($opt_debug) {
 	    debug_msg "Found $dir/$_" if /^kpsewhich/;
 	}
     }
-
 }
 
+
 if ($sys) {
     $INSTALLROOT=expand_var 'TEXMFLOCAL';
 } else {
@@ -185,9 +188,13 @@ die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n"
 
 
 if ($opt_help) {
-  usage; 
-  print <<"ENDUSAGE";
-     Directories:
+    print "\nThis is getnonfreefonts";
+    print '-sys' if ($sys);
+    print ", version $TL_version.\n\n";
+    
+    usage; 
+    print <<"ENDUSAGE";
+  Directories:
        temporary: '$SYSTMP/getfont-<PID>'
        install:   '$INSTALLROOT'
 
diff --git a/Build/source/texk/texlive/getnonfreefonts.man b/Build/source/texk/texlive/getnonfreefonts.man
index ea039466572..0c2da752fbf 100644
--- a/Build/source/texk/texlive/getnonfreefonts.man
+++ b/Build/source/texk/texlive/getnonfreefonts.man
@@ -57,6 +57,12 @@ to get a list of supported fonts.
 Install all fonts.
 
 .TP
+.BR "-d" , " --debug"
+.rg
+Provide additional messages for debugging.  These messages are sent to
+STDERR.
+
+.TP
 .BR "-f" , " --force"
 .rg
 Install fonts even if they are installed already.
@@ -90,6 +96,11 @@ option it behaves exactly like
 .rg
 Be more verbose.  This option is only needed for debugging.
 
+.TP
+.BR "--version"
+.rg
+Print version number.
+
 .SH ENVIRONMENT
 One of the environment variables
 .BR "TMP" , " TEMP" ,