haste-boot: fix argument passing for haste-cabal wrapper.

valderman · Jan 10, 2017 · 71a8353 · 71a8353
1 parent 1f6d6a6
commit 71a8353
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/haste-boot.hs b/src/haste-boot.hs
@@ -261,12 +261,22 @@ hasteCabalLauncher True = unlines
   , "HASTEC=\"$(dirname $0)/hastec\""
   , "DIR=\"$($HASTEC --print-libdir)/../haste-cabal\""
   , "export LD_LIBRARY_PATH=$DIR"
-  , "exec $DIR/haste-cabal.bin $@" ]
+  , "args=\"\""
+  , "for arg in \"$@\" ; do"
+  , "  args=\"$args \\\"$arg\\\"\""
+  , "done"
+  , "echo $args | xargs $DIR/haste-cabal.bin"
+  ]
 hasteCabalLauncher False = unlines
   [ "#!/bin/bash"
   , "DIR=\"" ++ hasteCabalRootDir False </> "haste-cabal" ++ "\""
   , "export LD_LIBRARY_PATH=$DIR"
-  , "exec $DIR/haste-cabal.bin $@" ]
+  , "args=\"\""
+  , "for arg in \"$@\" ; do"
+  , "  args=\"$args \\\"$arg\\\"\""
+  , "done"
+  , "echo $args | xargs $DIR/haste-cabal.bin"
+  ]
 
 -- | Fetch the Haste base libs.
 fetchLibs :: FilePath -> Shell ()