From 38db906a242b18585bd9fbc5e8892eb7784ffce9 Mon Sep 17 00:00:00 2001 From: Karthik K Date: Sun, 24 May 2015 18:25:49 +0530 Subject: [PATCH] Change switch --list to --list-running * --list is still supported for backward compatability, but will neither have an entry in help output nor will have bash completion support --- bash_completion | 4 ++-- create_ap | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bash_completion b/bash_completion index d72d091..b1a80d8 100644 --- a/bash_completion +++ b/bash_completion @@ -123,9 +123,9 @@ _create_ap() { ;; --stop) local stop_awk_cmd='$1 ~ /^[0-9]+$/' - opts=$("$1" --list | awk "$stop_awk_cmd") + opts=$("$1" --list-running | awk "$stop_awk_cmd") ;; - --list) + --list-running) # No Options ;; --mkconfig) diff --git a/create_ap b/create_ap index 300734b..159cb76 100755 --- a/create_ap +++ b/create_ap @@ -56,8 +56,8 @@ usage() { echo " --daemon Run create_ap in the background" echo " --stop Send stop command to an already running create_ap. For an " echo " you can put the PID of create_ap or the WiFi interface. You can" - echo " get them with --list" - echo " --list Show the create_ap processes that are already running" + echo " get them with --list-running" + echo " --list-running Show the create_ap processes that are already running" echo " --mkconfig Store configs in conf_file" echo " --config Load configs from conf_file" echo @@ -891,7 +891,7 @@ for ((i=0; i<$#; i++)); do fi done -GETOPT_ARGS=$(getopt -o hc:w:g:dnm: -l "help","hidden","ieee80211n","ht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","daemon","stop:","list","version","psk","no-haveged","mkconfig:","config:" -n "$PROGNAME" -- "$@") +GETOPT_ARGS=$(getopt -o hc:w:g:dnm: -l "help","hidden","ieee80211n","ht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","daemon","stop:","list","list-running","version","psk","no-haveged","mkconfig:","config:" -n "$PROGNAME" -- "$@") [[ $? -ne 0 ]] && exit 1 eval set -- "$GETOPT_ARGS" @@ -985,6 +985,11 @@ while :; do shift ;; --list) + shift + LIST_RUNNING=1 + echo -e "WARN: --list is deprecated. Use --list-running instead.\n" 2>&1 + ;; + --list-running) shift LIST_RUNNING=1 ;; @@ -1271,8 +1276,8 @@ echo "Config dir: $CONFDIR" echo "PID: $$" echo $$ > $CONFDIR/pid -# to make --list work from any user, we must give read -# permitions to $CONFDIR and $CONFDIR/pid +# to make --list-running work from any user, we must give read +# permissions to $CONFDIR and $CONFDIR/pid chmod 755 $CONFDIR chmod 444 $CONFDIR/pid