diff --git a/README.md b/README.md index 5cb9105..1df8b2e 100644 --- a/README.md +++ b/README.md @@ -101,11 +101,6 @@ OPTIONS --user defaults to 'aj' --workdir where the command runs, defaults to current directory -DEPRECATED (DO NOT USE) - --system alias of --daemon, for compatibility - --username alias of --user, for compatibility - --groupname alias of --group, for compatibility - EXAMPLES caddy: serviceman add -- caddy run --envfile ./.env --config ./Caddyfile --adapter caddyfile node: serviceman add --workdir . --name 'api' -- node ./server.js diff --git a/bin/serviceman b/bin/serviceman index f280516..266ac8f 100755 --- a/bin/serviceman +++ b/bin/serviceman @@ -93,11 +93,6 @@ fn_add_help() { ( echo " --user defaults to '$(id -u -n)'" echo ' --workdir where the command runs, defaults to current directory' echo "" - echo "DEPRECATED (DO NOT USE)" - echo " --system alias of --daemon, for compatibility" - echo " --username alias of --user, for compatibility" - echo " --groupname alias of --group, for compatibility" - echo "" echo "EXAMPLES" echo " caddy: serviceman add -- caddy run --envfile ./.env --config ./Caddyfile --adapter caddyfile" echo " node: serviceman add --workdir . --name 'api' -- node ./server.js" @@ -177,63 +172,6 @@ cmd_add() { ( ;; esac - # transitional - case "${b_arg}" in - -help) - echo "warn: -help should be --help" - b_arg='--help' - ;; - -cap-net-bind | --cap-net-bind) - echo "warn: --cap-net-bind is now the default, use --no-cap-net-bind to disable" - b_arg='--no-cap-net-bind' - ;; - -dryrun) - echo "warn: -dryrun should be --dryrun" - b_arg='--dryrun' - ;; - -force) - echo "warn: -force should be --force" - b_arg='--force' - ;; - -system | --system) - echo "warn: --system is now --daemon" - b_arg='--daemon' - ;; - -name) - echo "warn: -name should be --name" - b_arg='--name' - ;; - -desc) - echo "warn: -desc should be --desc" - b_arg='--desc' - ;; - -groupname | --groupname) - echo "warn: --groupname should be --group" - b_arg='--group' - ;; - -rdns) - echo "warn: -rdns should be --rdns" - b_arg='--rdns' - ;; - -title) - echo "warn: -title should be --title" - b_arg='--title' - ;; - -url) - echo "warn: -url should be --url" - b_arg='--url' - ;; - -user | -username | --username) - echo "warn: --username should be --user" - b_arg='--user' - ;; - -workdir) - echo "warn: -workdir should be --workdir" - b_arg='--workdir' - ;; - *) ;; - esac - case "${b_arg}" in --) break