fix and fix again the tl-update-nsis, thanks Siep

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

1 files changed, 7 insertions, 5 deletions

diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis
index 6c8d51208ef..0f3f5862473 100755
--- a/Master/tlpkg/bin/tl-update-nsis
+++ b/Master/tlpkg/bin/tl-update-nsis
@@ -134,11 +134,13 @@ EOF
       print "  File $mm\\$dd\\$f\n";
     }
   }
-print <<'EOF';
-  # order here is important!!! first the main packages, then the .doc ones!
-  ExecWait '"$INSTDIR\bin\win32\tlmgr.bat" _include_tlpobj "$INSTDIR\tlpkg\tlpobj\bin-texlive.tlpobj" "$INSTDIR\tlpkg\tlpobj\texlive.infra.tlpobj" "$INSTDIR\tlpkg\tlpobj\texlive.infra.doc.tlpobj" "$INSTDIR\tlpkg\tlpobj\texlive.infra.win32.tlpobj"'
-SectionEnd
-EOF
+  print "  ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj";
+  for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
+    if (defined $p) {
+      print " \"\$INSTDIR\\tlpkg\\tlpobj\\", $p->name, ".tlpobj\"";
+    }
+  }
+  print "'\nSectionEnd\n";
 }