diff options
Diffstat (limited to 'Master/bin/hppa-hpux/getnonfreefonts')
| -rwxr-xr-x | Master/bin/hppa-hpux/getnonfreefonts | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Master/bin/hppa-hpux/getnonfreefonts b/Master/bin/hppa-hpux/getnonfreefonts index 5965b4fc64a..969a251b52c 100755 --- a/Master/bin/hppa-hpux/getnonfreefonts +++ b/Master/bin/hppa-hpux/getnonfreefonts @@ -107,7 +107,7 @@ sub expand_var { } while (<KPSEWHICH>) { chop; - return "$_"; + return $_; } close KPSEWHICH; } @@ -172,9 +172,11 @@ if ($opt_debug) { } -$INSTALLROOTNAME=($sys)? 'TEXMFLOCAL':'TEXMFHOME'; - -$INSTALLROOT=expand_var "$INSTALLROOTNAME"; +if ($sys) { + $INSTALLROOT=expand_var 'TEXMFLOCAL'; +} else { + $INSTALLROOT=expand_var 'TEXMFHOME'; +} ($sys)? debug_msg "sys=true":debug_msg "sys=false"; @@ -186,13 +188,7 @@ $INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^\\\\/); # \\abc\def debug_msg "Internal variable INSTALLROOT converted to '$INSTALLROOT'"; sub check_installroot { - die "! ERROR: The variable $INSTALLROOTNAME is not set.\n" - unless length ("$INSTALLROOT") > 0; - - die "! ERROR: The install directory '$INSTALLROOT' doesn't " . - "exist.\n" . - " If this is the correct path, please create " . - "this directory manually.\n" + die "! ERROR: The install directory '$INSTALLROOT' doesn't exist.\n" unless (-d "$INSTALLROOT"); die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n" |