From dd01fd18c62619343ca7d863947edc8506c17926 Mon Sep 17 00:00:00 2001 From: Reinhard Kotucha Date: Sun, 7 Jan 2007 02:13:49 +0000 Subject: Update getnonfreefonts. git-svn-id: svn://tug.org/texlive/trunk@3188 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/texlive/getnonfreefonts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/texlive/getnonfreefonts b/Build/source/texk/texlive/getnonfreefonts index 969a251b52c..5965b4fc64a 100644 --- a/Build/source/texk/texlive/getnonfreefonts +++ b/Build/source/texk/texlive/getnonfreefonts @@ -107,7 +107,7 @@ sub expand_var { } while () { chop; - return $_; + return "$_"; } close KPSEWHICH; } @@ -172,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"; @@ -188,7 +186,13 @@ $INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^\\\\/); # \\abc\def debug_msg "Internal variable INSTALLROOT converted to '$INSTALLROOT'"; sub check_installroot { - die "! ERROR: The install directory '$INSTALLROOT' doesn't exist.\n" + 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" unless (-d "$INSTALLROOT"); die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n" -- cgit v1.2.3