Merge branch 'master' into full-pkg-pathfull-pkg-path

FossilOrigin-Name: 116d2928ca61b3db6ae9c2c7719838b488db938f6f1ca76b483d4ef9da7cf3d0

1 files changed, 1 insertions, 7 deletions

diff --git a/src/cpt-remove b/src/cpt-remove
index b6fed58..bcf5047 100755
--- a/src/cpt-remove
+++ b/src/cpt-remove
@@ -1,8 +1,6 @@
 #!/bin/sh -ef
 # Remove a package
 
-if [ -f ./cpt-lib ]; then . ./cpt-lib; else . cpt-lib; fi
-
 parser_definition() {
     setup REST help:usage -- "usage: ${0##*/} [pkg...]"
     msg -- '' 'Options:'
@@ -10,10 +8,7 @@ parser_definition() {
     global_options
 }
 
-eval "$(getoptions parser_definition parse "$0")"
-
-parse "$@"
-eval set -- "$REST"
+if [ -f ./cpt-lib ]; then . ./cpt-lib; else . cpt-lib; fi
 
 [ "$1" ] || set -- "${PWD##*/}"; export CPT_PATH=${PWD%/*}:$CPT_PATH
 
@@ -23,6 +18,5 @@ eval set -- "$REST"
 }
 
 create_cache
-
 pkg_order "$@"
 for pkg in $redro; do pkg_remove "$pkg" "${CPT_FORCE:-check}"; done