stable 2005.02.03

2 files changed, 37 insertions, 36 deletions

diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl
index b9a80bec6..973e2daee 100644
--- a/scripts/context/perl/texexec.pl
+++ b/scripts/context/perl/texexec.pl
@@ -341,11 +341,12 @@ if ($Paranoid) {
     $ENV{openin_any}   = 'a' ;
 }
 
-if ($ENV{openin_any} eq 'p') {
+if (defined $ENV{openin_any} && $ENV{openin_any} eq 'p') {
     $Paranoid = 1 ; # extra test in order to set readlevel
 }
 
-if (($ENV{shell_escape} eq 'f') || ($ENV{SHELL_ESCAPE} eq 'f')) {
+if ((defined $ENV{shell_escape} && $ENV{shell_escape} eq 'f') ||
+    (defined $ENV{SHELL_ESCAPE} && $ENV{SHELL_ESCAPE} eq 'f')) {
     $AutoMPRun = 1 ;
 }
 
diff --git a/scripts/context/perl/texfont.pl b/scripts/context/perl/texfont.pl
index a39be0d94..71433cb56 100644
--- a/scripts/context/perl/texfont.pl
+++ b/scripts/context/perl/texfont.pl
@@ -660,40 +660,40 @@ sub globafmfiles
       { report("locating afm files : using pattern $pattern") }
     else
       { @files = validglob("$runpath/$pattern.ttf") ;
-	if (@files)
-	  { report("locating afm files : using ttf files") ;
-	    $extension = "ttf" ;
-	    foreach my $file (@files)
-               { $file =~ s/\.ttf$//io ;
-                 report ("generating afm file : $file.afm") ;
-                 my $command = "ttf2afm \"$file.ttf\" -o \"$file.afm\"" ;
-                 system($command) ;
-                 print "$command\n" if $trace ;
-                 push(@cleanup, "$file.afm") }
-	    @files = validglob("$runpath/$pattern.afm") }
-	else # try doing the pre-processing earlier
-	  { report("locating afm files : using otf files") ;
-	    $extension = "otf" ;
-	    @files = validglob("$runpath/$pattern.otf") ;
-	    foreach my $file (@files)
-	      { $file =~ s/\.otf$//io ;
-		if (!$lcdf)
-		{ report ("generating afm file : $file.afm") ;
-		  preprocess_font("$file.otf", "$file.bdf") ;
-          push(@cleanup,"$file.afm") }
-		if ($preproc)
-		{ my $command = "cfftot1 --output=$file.pfb $file.otf" ;
-                  print "$command\n" if $trace ;
-		  report("converting : $file.otf to $file.pfb") ;
-                  system($command) ;
-                  push(@cleanup, "$file.pfb") ;
-	        }
-	      }
-      	    if ($lcdf)
-	    { @files = validglob("$runpath/$pattern.otf") }
-	    else
-	    { @files = validglob("$runpath/$pattern.afm") }
-	  }
+        if (@files)
+          { report("locating afm files : using ttf files") ;
+            $extension = "ttf" ;
+            foreach my $file (@files)
+                   { $file =~ s/\.ttf$//io ;
+                     report ("generating afm file : $file.afm") ;
+                     my $command = "ttf2afm \"$file.ttf\" -o \"$file.afm\"" ;
+                     system($command) ;
+                     print "$command\n" if $trace ;
+                     push(@cleanup, "$file.afm") }
+            @files = validglob("$runpath/$pattern.afm") }
+        else # try doing the pre-processing earlier
+          { report("locating afm files : using otf files") ;
+            $extension = "otf" ;
+            @files = validglob("$runpath/$pattern.otf") ;
+            foreach my $file (@files)
+              { $file =~ s/\.otf$//io ;
+            if (!$lcdf)
+            { report ("generating afm file : $file.afm") ;
+              preprocess_font("$file.otf", "$file.bdf") ;
+              push(@cleanup,"$file.afm") }
+            if ($preproc)
+            { my $command = "cfftot1 --output=$file.pfb $file.otf" ;
+                      print "$command\n" if $trace ;
+              report("converting : $file.otf to $file.pfb") ;
+                      system($command) ;
+                      push(@cleanup, "$file.pfb") ;
+                }
+              }
+                if ($lcdf)
+            { @files = validglob("$runpath/$pattern.otf") }
+            else
+            { @files = validglob("$runpath/$pattern.afm") }
+          }
        }
     return @files }