From 4add9c31adb279332d731e894f6a754bdc013b9a Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Tue, 2 Aug 2022 19:27:17 -0400
Subject: [PATCH] Wifictl improvement thanks to @kkoshelev and original commit
 b27d629

---
 packages/jelos/sources/scripts/wifictl | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/jelos/sources/scripts/wifictl b/packages/jelos/sources/scripts/wifictl
index 06631bfc6..975fca75e 100755
--- a/packages/jelos/sources/scripts/wifictl
+++ b/packages/jelos/sources/scripts/wifictl
@@ -1,6 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2020 Fewtarius (https://github.com/fewtarius)
+# Copyright (C) 2022 kkoshelev (https://github.com/kkoshelev)
 
 . /etc/profile
 
@@ -27,6 +28,17 @@ fi
 
 WIFICFG="/storage/.cache/connman/wifi.config"
 
+# lists all wifi services in service=ssid format
+list_wifi() {
+  connmanctl services | cut -b 5- | awk '/\S+.+\s+wifi/ {a=$0; sub(/\s+wifi_.*$/,"", a); b=$0; sub(a, "", b); sub(/\s+/, "", b); print b "=" a}' | sort | uniq
+}
+
+# Looksup connman service name based on ssid
+# $1 - SSID to lookup
+get_wifi_service() {
+  list_wifi | awk -v ssid="${1}" '{ split($0, a, "="); if (a[2]==ssid) print a[1] }'
+}
+
 set_powersave() {
   ENABLED=$(get_setting wifi.powersave)
   if [ "${ENABLED}" = "1" ]
@@ -55,6 +67,7 @@ EOF
       connmanctl enable wifi 2>/dev/null
       set_powersave 2>/dev/null
       connmanctl scan wifi 2>/dev/null
+      connmanctl connect $(get_wifi_service "${SSID}") 2>/dev/null
     ;;
     "disable")
       connmanctl disable wifi 2>/dev/null
@@ -62,14 +75,18 @@ EOF
       set_setting wifi.enabled 0
     ;;
     "list")
-      connmanctl services | cut -b 5- | awk '/wifi/ {sub(/\s+wifi_.*$/,"",$0);print}' | sort | uniq
+      #connmanctl services | cut -b 5- | awk '/wifi/ {sub(/\s+wifi_.*$/,"",$0);print}' | sort | uniq
+      list_wifi | awk '{sub(/\S+=/,"",$0);print}'
     ;;
     "scan")
       connmanctl scan 2>/dev/null
     ;;
     "scanlist")
       set_wifi scan 2>/dev/null
-      set_wifi list 2>/dev/null
+      list_wifi | awk '{sub(/\S+=/,"",$0);print}'
+    ;;
+    "service")
+       get_wifi_service "${SSID}"
     ;;
     "setpowersave")
       set_powersave 2>/dev/null