13 files changed, 24 insertions, 20 deletions
diff --git a/Master/bin/alpha-linux/getnonfreefonts b/Master/bin/alpha-linux/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/alpha-linux/getnonfreefonts
+++ b/Master/bin/alpha-linux/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/hppa-hpux/getnonfreefonts b/Master/bin/hppa-hpux/getnonfreefonts
index 969a251b52c..3ab220ee570 100755
--- a/Master/bin/hppa-hpux/getnonfreefonts
+++ b/Master/bin/hppa-hpux/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
@@ -107,7 +107,7 @@ sub expand_var {
     }
     while (<KPSEWHICH>) {
 	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"
diff --git a/Master/bin/i386-darwin/getnonfreefonts b/Master/bin/i386-darwin/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/i386-darwin/getnonfreefonts
+++ b/Master/bin/i386-darwin/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/i386-freebsd/getnonfreefonts b/Master/bin/i386-freebsd/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/i386-freebsd/getnonfreefonts
+++ b/Master/bin/i386-freebsd/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/i386-linux/getnonfreefonts b/Master/bin/i386-linux/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/i386-linux/getnonfreefonts
+++ b/Master/bin/i386-linux/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/i386-openbsd/getnonfreefonts b/Master/bin/i386-openbsd/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/i386-openbsd/getnonfreefonts
+++ b/Master/bin/i386-openbsd/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/i386-solaris/getnonfreefonts b/Master/bin/i386-solaris/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/i386-solaris/getnonfreefonts
+++ b/Master/bin/i386-solaris/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/mips-irix/getnonfreefonts b/Master/bin/mips-irix/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/mips-irix/getnonfreefonts
+++ b/Master/bin/mips-irix/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/powerpc-aix/getnonfreefonts b/Master/bin/powerpc-aix/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/powerpc-aix/getnonfreefonts
+++ b/Master/bin/powerpc-aix/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/powerpc-darwin/getnonfreefonts b/Master/bin/powerpc-darwin/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/powerpc-darwin/getnonfreefonts
+++ b/Master/bin/powerpc-darwin/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/sparc-linux/getnonfreefonts b/Master/bin/sparc-linux/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/sparc-linux/getnonfreefonts
+++ b/Master/bin/sparc-linux/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/win32/getnonfreefonts.bat b/Master/bin/win32/getnonfreefonts.bat
index 1967ce698b2..3a748b46320 100644
--- a/Master/bin/win32/getnonfreefonts.bat
+++ b/Master/bin/win32/getnonfreefonts.bat
@@ -18,7 +18,7 @@ goto endofperl
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/x86_64-linux/getnonfreefonts b/Master/bin/x86_64-linux/getnonfreefonts
index 5965b4fc64a..3ab220ee570 100755
--- a/Master/bin/x86_64-linux/getnonfreefonts
+++ b/Master/bin/x86_64-linux/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2006';
+my $TL_version='2007';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";