diff --git a/merry.opam b/merry.opam index 9343cd7..8156cb8 100644 --- a/merry.opam +++ b/merry.opam @@ -56,7 +56,7 @@ x-maintenance-intent: ["(latest)"] pin-depends:[ [ "eio_mem.dev" "git+https://git.sirref.org/eio_mem#3e7d5dd3de6d221b4b1bd694a119f10ea4d62184" ] [ "bruit.dev" "git+https://git.sirref.org/bruit#75b64b7dfad9ce659d91128fb49773dfa78926ee" ] - [ "glob.dev" "git+https://git.sirref.org/glob#c1856d8bcc69a7b2d0e567dd3e7b4f0318db3f03" ] + [ "glob.dev" "git+https://git.sirref.org/glob#c31476b81ddb05462642bc1d3ff7a64c6306256a" ] [ "eio_brr.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] [ "eio_js_backend.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] ] diff --git a/merry.opam.template b/merry.opam.template index 0d3f784..783753d 100644 --- a/merry.opam.template +++ b/merry.opam.template @@ -1,7 +1,7 @@ pin-depends:[ [ "eio_mem.dev" "git+https://git.sirref.org/eio_mem#3e7d5dd3de6d221b4b1bd694a119f10ea4d62184" ] [ "bruit.dev" "git+https://git.sirref.org/bruit#75b64b7dfad9ce659d91128fb49773dfa78926ee" ] - [ "glob.dev" "git+https://git.sirref.org/glob#c1856d8bcc69a7b2d0e567dd3e7b4f0318db3f03" ] + [ "glob.dev" "git+https://git.sirref.org/glob#c31476b81ddb05462642bc1d3ff7a64c6306256a" ] [ "eio_brr.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] [ "eio_js_backend.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] ] diff --git a/src/lib/eval.ml b/src/lib/eval.ml index addf0ab..28af748 100644 --- a/src/lib/eval.ml +++ b/src/lib/eval.ml @@ -1964,6 +1964,7 @@ module Make (S : Types.State) (Fd : Types.Fd) (E : Types.Exec) = struct run_subshells cc and glob_expand ctx pattern : ctx * Ast.fragment list = + Debug.Log.info (fun f -> f "Expanding %s" pattern); Eio.Switch.run @@ fun sw -> let dir = if not @@ Filename.is_relative pattern then fs ctx diff --git a/test/regressions.t b/test/regressions.t index 7e0f6d4..ad6c343 100644 --- a/test/regressions.t +++ b/test/regressions.t @@ -152,3 +152,26 @@ And these variables appearing inside subcommands: $ msh test.sh NEW_VARIABLE=foo +Testing some globbing that has gone a bit wrong: + + $ cat > test.sh << EOF + > touch abc.txt abcdef.txt abdef.txt abc.png + > mkdir -p abc-dir + > touch abc-dir/hello.txt + > ls abc* + > EOF + + $ sh test.sh + abc.png + abc.txt + abcdef.txt + + abc-dir: + hello.txt + $ msh test.sh + abc.png + abc.txt + abcdef.txt + + abc-dir: + hello.txt