Fix completion script for output from more recent cmdliners

ocaml · Apr 14, 2017 · 1ed4880 · 1ed4880
1 parent cdaceb5
commit 1ed4880
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/shell/opam_completion.sh b/shell/opam_completion.sh
@@ -15,15 +15,18 @@ _opam_add_f()
 _opam_flags()
 {
   opam "$@" --help=groff 2>/dev/null | \
-      sed -n -e 's%\\-%-%g' -e 's%, \\fB%\n\\fB%g' -e '/^\\fB-/p' | \
+      sed -n \
+      -e 's%\\-\|\\N'"'45'"'%-%g' \
+      -e 's%, \\fB%\n\\fB%g' \
+      -e '/^\\fB-/p' | \
       sed -e 's%^\\fB\(-[^\\]*\).*%\1%'
 }
 
 _opam_commands()
 {
   opam "$@" --help=groff 2>/dev/null | \
       sed -n \
-      -e 's%\\-%-%g' \
+      -e 's%\\-\|\\N'"'45'"'%-%g' \
       -e '/^\.SH COMMANDS$/,/^\.SH/ s%^\\fB\([^,= ]*\)\\fR.*%\1%p'
   echo '--help'
 }
@@ -45,7 +48,7 @@ _opam_argtype()
       -*)
           opam "$cmd" --help=groff 2>/dev/null | \
           sed -n \
-              -e 's%\\-%-%g' \
+              -e 's%\\-\|\\N'"'45'"'%-%g' \
               -e 's%.*\\fB'"$flag"'\\fR[= ]\\fI\([^, ]*\)\\fR.*%\1%p'
           ;;
   esac

diff --git a/shell/opam_completion_zsh.sh b/shell/opam_completion_zsh.sh
@@ -17,15 +17,18 @@ _opam_add_f()
 _opam_flags()
 {
   opam "$@" --help=groff 2>/dev/null | \
-      sed -n -e 's%\\-%-%g' -e 's%, \\fB%\n\\fB%g' -e '/^\\fB-/p' | \
+      sed -n \
+      -e 's%\\-\|\\N'"'45'"'%-%g' \
+      -e 's%, \\fB%\n\\fB%g' \
+      -e '/^\\fB-/p' | \
       sed -e 's%^\\fB\(-[^\\]*\).*%\1%'
 }
 
 _opam_commands()
 {
   opam "$@" --help=groff 2>/dev/null | \
       sed -n \
-      -e 's%\\-%-%g' \
+      -e 's%\\-\|\\N'"'45'"'%-%g' \
       -e '/^\.SH COMMANDS$/,/^\.SH/ s%^\\fB\([^,= ]*\)\\fR.*%\1%p'
   echo '--help'
 }
@@ -47,7 +50,7 @@ _opam_argtype()
       -*)
           opam "$cmd" --help=groff 2>/dev/null | \
           sed -n \
-              -e 's%\\-%-%g' \
+              -e 's%\\-\|\\N'"'45'"'%-%g' \
               -e 's%.*\\fB'"$flag"'\\fR[= ]\\fI\([^, ]*\)\\fR.*%\1%p'
           ;;
   esac