Tentative fix for FilePath regression

gregwebs · Apr 1, 2022 · 51b2fa1 · 51b2fa1
1 parent 69fd6a5
commit 51b2fa1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/shelly.cabal b/shelly.cabal
@@ -47,6 +47,7 @@ extra-source-files:
   test/data/zshrc
   test/data/nonascii.txt
   test/data/symlinked_dir/hoge_file
+  test/data/hello.sh
   test/testall
   README.md
   ChangeLog.md

diff --git a/src/Shelly.hs b/src/Shelly.hs
@@ -325,22 +325,26 @@ runCommand handles st exe args = findExe exe >>= \fullExe ->
 #if defined(mingw32_HOST_OS)
       fp
 #else
-      _fp
+      fp
 #endif
-      = do
-        mExe <- whichEith exe
-        case mExe of
-          Right execFp -> return execFp
-          -- windows looks in extra places besides the PATH, so just give
-          -- up even if the behavior is not properly specified anymore
-          --
-          -- non-Windows < 7.8 has a bug for read-only file systems
-          -- https://github.com/yesodweb/Shelly.hs/issues/56
-          -- it would be better to specifically detect that bug
+      = case fp of
+          -- If the 'FilePath' contains a more articulated path than just
+          -- an executable, don't try to find it.
+          '.' : _ -> return fp
+          _ -> do
+            mExe <- whichEith exe
+            case mExe of
+              Right execFp -> return execFp
+              -- windows looks in extra places besides the PATH, so just give
+              -- up even if the behavior is not properly specified anymore
+              --
+              -- non-Windows < 7.8 has a bug for read-only file systems
+              -- https://github.com/yesodweb/Shelly.hs/issues/56
+              -- it would be better to specifically detect that bug
 #if defined(mingw32_HOST_OS)
-          Left _ -> return fp
+              Left _ -> return fp
 #else
-          Left err -> liftIO $ throwIO $ userError err
+              Left err -> liftIO $ throwIO $ userError err
 #endif
 
 

diff --git a/test/data/hello.sh b/test/data/hello.sh
diff --git a/test/src/FindSpec.hs b/test/src/FindSpec.hs
@@ -115,6 +115,7 @@ findSpec = do
               [ "dir"
               , "dir/symlinked_dir"
               , "dir/symlinked_dir/hoge_file"
+              , "hello.sh"
               , "nonascii.txt"
               , "symlinked_dir"
               , "symlinked_dir/hoge_file"
@@ -128,6 +129,7 @@ findSpec = do
             sort res @?=
               [ "dir"
               , "dir/symlinked_dir"
+              , "hello.sh"
               , "nonascii.txt"
               , "symlinked_dir"
               , "symlinked_dir/hoge_file"

diff --git a/test/src/RunSpec.hs b/test/src/RunSpec.hs
@@ -28,9 +28,12 @@ runSpec = do
       if isWindows
         then res @?= "Selbstverst\228ndlich \252berraschend\r\n"
         else res @?= "Selbstverst\228ndlich \252berraschend\n"
-    it "script at $PWD" $ do
-      res <- shelly $ run "./test/data/hello.sh" []
-      res @?= "Hello!"
+    unless isWindows $
+      it "script at $PWD" $ do
+        res <- shelly $ do
+          run_ "chmod" ["+x", "test/data/hello.sh"]
+          run "./test/data/hello.sh" []
+        res @?= "Hello!\n"
 
   -- Bash-related commands
   describe "bash" $ do