From a34c54161b41b0e30a9b9a4c887aca8e70f3bf90 Mon Sep 17 00:00:00 2001 From: Mikko Drocan Date: Sun, 12 Apr 2026 14:19:17 +0300 Subject: [PATCH 1/2] resolve conflict misses --- wifi_tools.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/wifi_tools.sh b/wifi_tools.sh index 667b5d2..8e565fc 100755 --- a/wifi_tools.sh +++ b/wifi_tools.sh @@ -112,9 +112,21 @@ reset_wifi() { case $1 in "") + if [ $# -gt 1 ]; then + echo "Error: Unexpected arguments for default command." >&2 + display_usage + exit 1 + fi + ensure_wifi_tools_ready show_wifi_signal ;; signal) + if [ $# -gt 2 ]; then + echo "Error: 'signal' takes at most one argument: ." >&2 + display_usage + exit 1 + fi + ensure_wifi_tools_ready show_wifi_signal if [ -n "$2" ]; then if [ "$2" -gt 0 ] 2>/dev/null; then @@ -132,6 +144,12 @@ signal) fi ;; list) + if [ $# -gt 1 ]; then + echo "Error: 'list' takes no arguments." >&2 + display_usage + exit 1 + fi + ensure_wifi_tools_ready list_wifi_networks ;; reset) @@ -140,6 +158,7 @@ reset) display_usage exit 1 fi + ensure_wifi_tools_ready reset_wifi ;; -h | --help) From c6c390c345095d891c3888fa785527249661baef Mon Sep 17 00:00:00 2001 From: Mikko Drocan Date: Sun, 12 Apr 2026 14:23:47 +0300 Subject: [PATCH 2/2] final fixes --- README.md | 4 ++-- wifi_tools.sh | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 4260a79..5740b1f 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Wi-Fi inspection and management tool. Subcommands: -- no args: show current Wi-Fi signal +- no args: show help - `signal`: show Wi-Fi signal metrics (channel, dBm, noise, SNR, Tx rate) - `signal `: repeat signal check `n` times (3s interval) - `list`: list previously-connected Wi-Fi networks (preferred networks on `en0`) @@ -99,7 +99,7 @@ Subcommands: Examples: ```sh -./wifi_tools.sh # Show current Wi-Fi signal +./wifi_tools.sh # Show help ./wifi_tools.sh signal # Show signal metrics ./wifi_tools.sh signal 10 # Repeat 10 times ./wifi_tools.sh list # List known networks diff --git a/wifi_tools.sh b/wifi_tools.sh index 8e565fc..0fe209f 100755 --- a/wifi_tools.sh +++ b/wifi_tools.sh @@ -17,7 +17,7 @@ display_usage() { echo "Usage: $scriptname [command] [options]" echo "" echo "Commands:" - echo " (no args) : Show current Wi-Fi signal." + echo " (no args) : Show this help." echo " signal : Show current Wi-Fi signal metrics." echo " signal : Repeat signal check n times (3s interval)." echo " list : List previously-connected Wi-Fi networks." @@ -112,13 +112,8 @@ reset_wifi() { case $1 in "") - if [ $# -gt 1 ]; then - echo "Error: Unexpected arguments for default command." >&2 - display_usage - exit 1 - fi - ensure_wifi_tools_ready - show_wifi_signal + display_usage + exit 0 ;; signal) if [ $# -gt 2 ]; then