diff options
author | merakor <cem@ckyln.com> | 2020-11-09 13:03:20 +0000 |
---|---|---|
committer | merakor <cem@ckyln.com> | 2020-11-09 13:03:20 +0000 |
commit | 13e58869dc0bf24acacc98650ef95d0d27598a4f (patch) | |
tree | e3b38f9315cb7545f1d3d3154c9f1d002e897479 /src/cpt-remove | |
parent | 85a95118d4427f9d49a227f91f379be5bec385e3 (diff) | |
download | cpt-13e58869dc0bf24acacc98650ef95d0d27598a4f.tar.gz |
getoptions(): parse the options during main() call on cpt-lib
Calling parse() after cpt-lib has been called causes sys_db to be initiated
using the wrong CPT_ROOT, among other issues. By calling the option parser
during the main(), we make sure that the options parsed are used as soon as
possible.
FossilOrigin-Name: 2933b99bec8ec9c3f20143e2a19c270a6d208f723d2b394c625cbc13d2625326
Diffstat (limited to 'src/cpt-remove')
-rwxr-xr-x | src/cpt-remove | 8 |
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 |