fixes for spaces in names

git-svn-id: svn://tug.org/texlive/trunk@6140 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 14 insertions, 14 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 0328e122d55..28f043d0272 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -56,8 +56,8 @@ our $trynet=0;
 # for now it is my testing archive on tug.org
 #$::texlive_url = 'http://tug.org/svn/texlive/trunk/Master';
 # for my own testing in the virtual machine
-#$::texlive_url = 'http://10.0.2.2/norbert/tltesting';
-$::texlive_url = 'http://tug.org/~preining/tltesting';
+$::texlive_url = 'http://10.0.2.2/norbert/tltesting';
+#$::texlive_url = 'http://tug.org/~preining/tltesting';
 # the default scheme to be installed
 my $default_scheme='scheme-full';
 # some arrays where the lists of collections to be installed are saved
@@ -610,15 +610,15 @@ sub do_postinst_stuff {
   my $perlint = (win32() ? "$vars{'TEXDIR'}/tlpkg/tlperl/bin/perl.exe" : "");
   # for arch != win32 $perlint is empty so the usual perl invocation is done
   if (win32()) {
-    `${perlint} $vars{'TEXDIR'}/tlpkg/bin/generate-fmtutil`;
-    `${perlint} $vars{'TEXDIR'}/tlpkg/bin/generate-updmap`;
-    `${perlint} $vars{'TEXDIR'}/tlpkg/bin/generate-language`;
+    `"${perlint}" "$vars{'TEXDIR'}/tlpkg/bin/generate-fmtutil"`;
+    `"${perlint}" "$vars{'TEXDIR'}/tlpkg/bin/generate-updmap"`;
+    `"${perlint}" "$vars{'TEXDIR'}/tlpkg/bin/generate-language"`;
   } else {
     `generate-fmtutil`;
     `generate-updmap`;
     `generate-language`;
   }
-  `mktexlsr $vars{'TEXDIR'}/texmf-dist $vars{'TEXDIR'}/texmf $vars{'TEXDIR'}/texmf-local`;
+  `mktexlsr "$vars{'TEXDIR'}/texmf-dist" "$vars{'TEXDIR'}/texmf" "$vars{'TEXDIR'}/texmf-local"`;
   # my $updmap   = (win32() ? "$perlint $vars{'TEXDIR'}/bin/win32/updmap-sys.pl"   : "updmap-sys");
   # `$updmap --nohash`;
   # we hope that the updmap-sys.texlua is executed ...
@@ -629,7 +629,7 @@ sub do_postinst_stuff {
     $ENV{'PATHEXT'} = $pathext;
   }
   `updmap-sys --nohash`;
-  `mktexlsr $vars{'TEXMFSYSVAR'}`;
+  `mktexlsr "$vars{'TEXMFSYSVAR'}"`;
 
   # old installer:
   #$config && texconfig-sys init
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index cf8573e9431..60fbc37fb3a 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -654,13 +654,13 @@ sub install_package {
       my $tarfile = $fn;
       $tarfile =~ s/\.lzma$//;
       mkdirhier("$target/temp");
-      mysystem("wget -nv -O $target\\temp\\$fn $what");
-      mysystem("lzma d $target\\temp\\$fn $target\\temp\\$tarfile");
-      mysystem("pushd $target & $bindir\\bsdtar.exe -xf temp\\$tarfile");
+      mysystem("wget -nv -O \"$target\\temp\\$fn\" \"$what\"");
+      mysystem("lzma d \"$target\\temp\\$fn\" \"$target\\temp\\$tarfile\"");
+      mysystem("pushd \"$target\" & \"$bindir\\bsdtar.exe\" -xf \"temp\\$tarfile\"");
       unlink("$target\\temp\\$tarfile");
       unlink("$target\\temp\\$fn");
     } else {
-      system "wget -nv -O- $what|$lzmadec|tar -xf - -C $target";
+      system "wget -nv -O- \"$what\"|\"$lzmadec\"|tar -xf - -C \"$target\"";
     }
   } elsif ($what =~ m,\.tar.lzma$,) {
     if (win32()) {
@@ -668,11 +668,11 @@ sub install_package {
       my $tarfile = $fn;
       $tarfile =~ s/\.lzma$//;
       mkdirhier("$target/temp");
-      mysystem("$bindir\\lzma.exe d $what $target\\temp\\$tarfile");
-      mysystem("pushd $target & $bindir\\bsdtar.exe -xf temp\\$tarfile");
+      mysystem("\"$bindir\\lzma.exe\" d \"$what\" \"$target\\temp\\$tarfile\"");
+      mysystem("pushd \"$target\" & \"$bindir\\bsdtar.exe\" -xf \"temp\\$tarfile\"");
       unlink("$target\\temp\\$tarfile");
     } else {
-      system "cat $what|$lzmadec|/bin/tar -xf - -C $target";
+      system "cat \"$what\"|\"$lzmadec\"|tar -xf - -C \"$target\"";
     }
   } else {
     die "Don't know how to install $what!\n";