Skip to content

Fix Windows only problem of wrapper command built by npm #140

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 1 commit into from
Closed

Fix Windows only problem of wrapper command built by npm #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions app/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ installImpl config@PackageConfig{ depends } limitJobs = do

getPureScriptVersion :: IO Version
getPureScriptVersion = do
let pursProc = inproc "purs" [ "--version" ] empty
let pursProc = inshell "purs --version" empty
outputLines <- shellToIOText pursProc
case outputLines of
[onlyLine]
Expand Down Expand Up @@ -392,19 +392,13 @@ exec execNames onlyDeps passthroughOptions limitJobs = do
installImpl pkg limitJobs

paths <- getPaths
let cmdParts = tail execNames
srcParts = [ "src" </> "**" </> "*.purs" | not onlyDeps ]
let srcParts = [ "src" </> "**" </> "*.purs" | not onlyDeps ]
exit
=<< Process.waitForProcess
=<< Process.runProcess
(head execNames)
(cmdParts <> passthroughOptions
<> map Path.encodeString (srcParts <> paths))
Nothing -- no special path to the working dir
Nothing -- no env vars
Nothing -- use existing stdin
Nothing -- use existing stdout
Nothing -- use existing stderr
=<< Process.runCommand
(unwords
(execNames <> passthroughOptions
<> map Path.encodeString (srcParts <> paths)))

checkForUpdates :: Bool -> Bool -> IO ()
checkForUpdates applyMinorUpdates applyMajorUpdates = do
Expand Down Expand Up @@ -526,7 +520,7 @@ verify arg limitJobs = do
sem <- newQSem max'
mapConcurrently (bracket_ (waitQSem sem) (signalQSem sem) . dirFor) dependencies
let srcGlobs = map (pathToTextUnsafe . (</> ("src" </> "**" </> "*.purs"))) dirs
procs "purs" ("compile" : srcGlobs) empty
shells ("purs compile" <> " " <> T.intercalate " " srcGlobs) empty

formatPackageFile :: IO ()
formatPackageFile =
Expand Down