cpt: remove getopt and use shell library instead.

FossilOrigin-Name: cbe6d1050c67fcce58e754cd03832089ffeb33a5f9455c55e71738ab11e0d056

1 files changed, 16 insertions, 16 deletions

diff --git a/src/cpt-remove b/src/cpt-remove
index 6c4bc82..7f3e64e 100755
--- a/src/cpt-remove
+++ b/src/cpt-remove
@@ -4,22 +4,20 @@
 # shellcheck disable=1091
 if command -v cpt-lib >/dev/null; then . cpt-lib; else . ./cpt-lib; fi
 
-eval set -- "$(getopt -l help,version,force,root: -- fhv "$@")"
-while :; do
-    case "$1" in
-        --help|-h)
-            out "usage: ${0##*/} [options] [pkg...]" "" \
-                "  Options:" \
-                "    --force           Force Removal" \
-                "    --root [rootdir]  Use an alternate root directory" ""
-            exit 1
-            ;;
-        -v|--version) version ;;
-        -f|--force) export CPT_FORCE=1; shift   ;;
-        --root)  export CPT_ROOT=$2; shift 2 ;;
-        --) shift; break ;;
-    esac
-done
+parser_definition() {
+    setup REST -- "usage: ${0##*/} [pkg...]"
+    msg -- '' 'Options:'
+    flag  CPT_FORCE -f --force   -- "Force removal"
+    param CPT_ROOT     --root    -- "Use an alternate root directory"
+    disp  :usage    -h --help    -- "Show this help message"
+    disp  :version  -v --version -- "Print version information"
+}
+
+eval "$(getoptions      parser_definition parse "$0")"
+eval "$(getoptions_help parser_definition usage "$0")"
+
+parse "$@"
+eval set -- "$REST"
 
 [ "$1" ] || set -- "${PWD##*/}"; export CPT_PATH=${PWD%/*}:$CPT_PATH
 
@@ -28,5 +26,7 @@ done
     exit $?
 }
 
+create_cache
+
 pkg_order "$@"
 for pkg in $redro; do pkg_remove "$pkg" "${CPT_FORCE:-check}"; done