summaryrefslogtreecommitdiff
path: root/Master/bin/i386-linux
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2006-12-31 01:09:36 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2006-12-31 01:09:36 +0000
commit28440aa9ac223b8c38974a5ccd52ae5566913923 (patch)
treee183b622cea85da495be6624e92ca91fa198657f /Master/bin/i386-linux
parent48f16fa9021635b9190c84a805b17d08cd2b6eb1 (diff)
update getnonfreefonts
git-svn-id: svn://tug.org/texlive/trunk@3050 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/bin/i386-linux')
-rwxr-xr-xMaster/bin/i386-linux/getnonfreefonts45
1 files changed, 25 insertions, 20 deletions
diff --git a/Master/bin/i386-linux/getnonfreefonts b/Master/bin/i386-linux/getnonfreefonts
index 41f628becc0..969a251b52c 100755
--- a/Master/bin/i386-linux/getnonfreefonts
+++ b/Master/bin/i386-linux/getnonfreefonts
@@ -50,10 +50,7 @@ EOF
;
}
-unless (@ARGV) {
- usage;
- exit 1;
-}
+@ARGS=@ARGV;
GetOptions
"all|a",
@@ -72,6 +69,16 @@ $sys=1 if $opt_sys;
@allpackages=@ARGV;
+print "$TL_version\n" and exit 0 if $opt_version;
+
+if ($opt_help or !@ARGS) {
+ print "\nThis is getnonfreefonts";
+ print '-sys' if ($sys);
+ print ", version $TL_version.\n\n";
+ usage;
+}
+
+
sub message {
my $message=shift;
if ($message=~/^\[/) {
@@ -106,7 +113,6 @@ sub expand_var {
}
-
# get TMP|TEMP|TMPDIR environment variable
if ($opt_debug) {
@@ -119,8 +125,6 @@ if ($opt_debug) {
}
}
-print "$TL_version\n" and exit 0 if $opt_version;
-
if (defined $ENV{'TMP'}) {
$SYSTMP="$ENV{'TMP'}";
@@ -144,12 +148,13 @@ $SYSTMP=~s/\\/\//g if ($SYSTMP=~/^\\\\/); # \\abc\def
debug_msg "Internal variable SYSTMP converted to '$SYSTMP'";
+sub check_tmpdir{
die "! ERROR: The temporary directory '$SYSTMP' doesn't exist.\n"
unless (-d "$SYSTMP");
die "! ERROR: The temporary directory '$SYSTMP' is not writable.\n"
unless (-w "$SYSTMP");
-
+}
# Determine INSTALLROOT.
@@ -182,28 +187,28 @@ $INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^\\\\/); # \\abc\def
debug_msg "Internal variable INSTALLROOT converted to '$INSTALLROOT'";
-die "! ERROR: The install directory '$INSTALLROOT' doesn't exist.\n"
- unless (-d "$INSTALLROOT");
-
-die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n"
- unless (-w "$INSTALLROOT");
-
-
-if ($opt_help) {
- print "\nThis is getnonfreefonts";
- print '-sys' if ($sys);
- print ", version $TL_version.\n\n";
+sub check_installroot {
+ die "! ERROR: The install directory '$INSTALLROOT' doesn't exist.\n"
+ unless (-d "$INSTALLROOT");
- usage;
+ die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n"
+ unless (-w "$INSTALLROOT");
+}
+
+if ($opt_help or !@ARGS) {
print <<"ENDUSAGE";
Directories:
temporary: '$SYSTMP/getfont-<PID>'
install: '$INSTALLROOT'
ENDUSAGE
+check_tmpdir;
+check_installroot;
exit 0;
}
+check_tmpdir;
+check_installroot;
my $tmpdir="$SYSTMP/getfont-$$";
debug_msg "Internal variable tmpdir set to '$tmpdir'";