detect fish version by looking for disown builtin

ocaml · Mar 27, 2019 · 9410650 · 9410650
1 parent cc79400
commit 9410650
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/client/opamConfigCommand.ml b/src/client/opamConfigCommand.ml
@@ -177,9 +177,9 @@ let rec print_fish_env env =
   (* set manpath if and only if fish version >= 2.6 *)
   let manpath_cmd v =
     OpamConsole.msg "%s" (
-      "awk -v f=$FISH_VERSION " ^
-      "'BEGIN { split(f, fs, \".\"); goodfish = fs[1] > 2 || (fs[1] == 2 && fs[2] >= 6); if (goodfish) { exit 0 } else { exit 1 } }' " ^
-      "; and "
+      (* test for existence of disown builtin, introduced in fish 2.7 *)
+      (* depends on `string' builtin, introduced in fish 2.3 *)
+      "builtin string match -q disown (builtin -n); and "
     ) ;
     set_arr_cmd "MANPATH" v in
   match env with