summaryrefslogtreecommitdiff
path: root/Master/bin/mips-irix
diff options
context:
space:
mode:
Diffstat (limited to 'Master/bin/mips-irix')
-rwxr-xr-xMaster/bin/mips-irix/getnonfreefonts59
1 files changed, 34 insertions, 25 deletions
diff --git a/Master/bin/mips-irix/getnonfreefonts b/Master/bin/mips-irix/getnonfreefonts
index 41f628becc0..5965b4fc64a 100755
--- a/Master/bin/mips-irix/getnonfreefonts
+++ b/Master/bin/mips-irix/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=~/^\[/) {
@@ -100,13 +107,12 @@ sub expand_var {
}
while (<KPSEWHICH>) {
chop;
- return $_;
+ return "$_";
}
close KPSEWHICH;
}
-
# 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.
@@ -167,11 +172,9 @@ if ($opt_debug) {
}
-if ($sys) {
- $INSTALLROOT=expand_var 'TEXMFLOCAL';
-} else {
- $INSTALLROOT=expand_var 'TEXMFHOME';
-}
+$INSTALLROOTNAME=($sys)? 'TEXMFLOCAL':'TEXMFHOME';
+
+$INSTALLROOT=expand_var "$INSTALLROOTNAME";
($sys)? debug_msg "sys=true":debug_msg "sys=false";
@@ -182,28 +185,34 @@ $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");
-
+sub check_installroot {
+ die "! ERROR: The variable $INSTALLROOTNAME is not set.\n"
+ unless length ("$INSTALLROOT") > 0;
-if ($opt_help) {
- print "\nThis is getnonfreefonts";
- print '-sys' if ($sys);
- print ", version $TL_version.\n\n";
+ die "! ERROR: The install directory '$INSTALLROOT' doesn't " .
+ "exist.\n" .
+ " If this is the correct path, please create " .
+ "this directory manually.\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'";