Changeset 8392 for src/Pugs/Embed

Timestamp:

12/23/05 13:09:56 (3 years ago)

Author:

audreyt

Message:

* %ENV{PARROT_PATH} is now consulted in runtime for

external parrot invocations (eg. PGE).
(Set it to a directory containing the "parrot" executable.)
Requested by luqui++

Files:

• src/Pugs/Embed/Parrot.hsc (modified) (1 diff)

src/Pugs/Embed/Parrot.hsc

@@ -20 +20 @@
     if isJust rv then return rv else do
     cwd <- getCurrentDirectory
+    rv  <- findExecutableInDirectory cwd cmd
+    if isJust rv then return rv else do
+    dir <- getEnv "PARROT_PATH"
+    if isNothing dir then return Nothing else do
+    rv  <- findExecutableInDirectory (fromJust dir) cmd
+    if isJust rv then return rv else do
+    return Nothing
+
+findExecutableInDirectory dir cmd = do
 ##ifdef PUGS_HAVE_POSIX
-    let parrot = cwd ++ ('/':cmd)
+    let file = dir ++ ('/':cmd)
 ##else
-    let parrot = cwd ++ ('\\':cmd) ++ ".exe"
+    let file = dir ++ ('\\':cmd) ++ ".exe"
 ##endif
-    ok  <- doesFileExist parrot
-    return $ if ok then Just parrot else Nothing
+    print ("Exisitng", file)
+    ok  <- doesFileExist file
+    return $ if ok then Just file else Nothing
 
 findParrot :: IO FilePath