Merge pull request #308 from stmuk/master

result of update-subtree.pl ext/Shell__Command
tadzik · Apr 20, 2016 · 172c434 · 172c434
2 parents 56e95bc + afee4e0
commit 172c434
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/ext/Shell__Command/META.info b/ext/Shell__Command/META.info
@@ -9,8 +9,8 @@
         "Test"
     ],
     "depends" : [
-        "File::Find",
-        "File::Which"
+        "File::Which",
+        "File::Find"
     ],
     "provides" : {
         "Shell::Command" : "lib/Shell/Command.pm"

diff --git a/ext/Shell__Command/lib/Shell/Command.pm b/ext/Shell__Command/lib/Shell/Command.pm
@@ -83,8 +83,13 @@ sub dos2unix($file) is export {
 }
 
 sub which($name) is export {
-  require File::Which <&which>;
-  which($name)
+  warn "Please use File::Which instead for a more portable solution."
+    if $*DISTRO.is-win || $*DISTRO.name eq 'macosx';
+
+  for $*SPEC.path.map({ $*SPEC.catfile($^dir, $name) }) {
+    return $_ if .IO.x;
+  }
+  Str
 }
 
 # vim: ft=perl6
diff --git a/ext/Shell__Command/t/02-shell-command.t b/ext/Shell__Command/t/02-shell-command.t
@@ -41,9 +41,9 @@ lives-ok { cp 't/dir1/file.foo', 't/dir2'; }, '#5';
 ok 't/dir2/file.foo'.IO.f, '#5';
 rm_rf 't/dir2';
 
-if $*DISTRO.is-win {
-  ok which('perl6'), 'which - perl6 is found';
+if $*DISTRO.is-win || ($*DISTRO.name eq 'macosx') {
+  skip 'which is not working properly on Windows/Mac OS X. Please use File::Which', 2;
 } else {
   ok which('perl6').IO.x, 'which - perl6 is found';
+  nok which('scoodelyboopersnake'), 'which - missing exe is false';
 }
-nok which('scoodelyboopersnake'), 'which - missing exe is false';