Fix output format for network device checking

3 files changed, 15 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 736674bc9966..893cd99166ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = throttlectl
 	pkgdesc = Command-line user discretion power managment utility
-	pkgver = 2
+	pkgver = 3
 	pkgrel = 1
 	url = https://bbs.archlinux.org/viewtopic.php?id=180762
 	arch = any
@@ -17,7 +17,7 @@ pkgbase = throttlectl
 	source = throttle-cut.service
 	source = powersave
 	source = performance
-	sha512sums = 224160daea80f89f4d09899e69898f828efabedf73b92d7f0509b208582ebbfb888699676a079070ba9214dad5df256f0da037de335667b6cfcda71a5d3457e2
+	sha512sums = 3c447a074a1b631d869b2fb61fe0a718cce3a82f872d147a58d7fb5eace13611e68799087e9a386fe2860fbab794f36ac787e003ec8ede27aad472840b7158d4
 	sha512sums = 6254e73446a91ea7945b9e4db1a1047eb2055d93aee315006857711ab21cba140da3badcf5834d2628e4799494a069647d11aa378a9bac67691df8d8b3adc12f
 	sha512sums = 3d487961bf86254817fd099b888d6245bbf1e57622166dc8df378d639bfb1c0fc105646038be6093183be102294394b88cde382fe961f7606b68619af4a00595
 	sha512sums = d11ed5f4344f07507497e816ccd7612ffc6df70636ca5f4817a9ce6e3b190b3a17fb02c44c4bf648359f640e4c63cc0b0134968ff4d3d989ad05fa4c095b03d3
diff --git a/PKGBUILD b/PKGBUILD
index d3fb43fa096e..f31e87afeb63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Que Quotion <quequotion@mailinator.com>
 
 pkgname=throttlectl
-pkgver=2
+pkgver=3
 pkgrel=1
 pkgdesc="Command-line user discretion power managment utility"
 arch=('any')
@@ -14,7 +14,7 @@ source=('throttlectl'
         'throttle-cut.service'
         'powersave'
         'performance')
-sha512sums=('224160daea80f89f4d09899e69898f828efabedf73b92d7f0509b208582ebbfb888699676a079070ba9214dad5df256f0da037de335667b6cfcda71a5d3457e2'
+sha512sums=('3c447a074a1b631d869b2fb61fe0a718cce3a82f872d147a58d7fb5eace13611e68799087e9a386fe2860fbab794f36ac787e003ec8ede27aad472840b7158d4'
             '6254e73446a91ea7945b9e4db1a1047eb2055d93aee315006857711ab21cba140da3badcf5834d2628e4799494a069647d11aa378a9bac67691df8d8b3adc12f'
             '3d487961bf86254817fd099b888d6245bbf1e57622166dc8df378d639bfb1c0fc105646038be6093183be102294394b88cde382fe961f7606b68619af4a00595'
             'd11ed5f4344f07507497e816ccd7612ffc6df70636ca5f4817a9ce6e3b190b3a17fb02c44c4bf648359f640e4c63cc0b0134968ff4d3d989ad05fa4c095b03d3')
diff --git a/throttlectl b/throttlectl
index b33c596e8dc3..a86c96824b8f 100755
--- a/throttlectl
+++ b/throttlectl
@@ -15,10 +15,7 @@ throttle_help() {
           "${0} ht {on,off} - Hyperthreads\n"\
           "${0} backlight {0,1,2} - Backlight brightness (laptops only?)\n" \
           "${0} gpu {cut,full} - GPU runtime powersaving (only Nvidia ATM)\n"\
-          "\nOptions are stackable:\n"\
-          "\n${0} powersave gov full turbo on gpu full ht on check\n"\
-          "\nComponents can be checked individually:\n"\
-          "\n${0} gov check turbo check ht check"
+          "\nAll options are stackable and take {{cut,powersave,start},{full,performace,stop},{check,status}}\n"
   exit
 }
 
@@ -195,13 +192,15 @@ check_system() {
   for i in /sys/module/*/parameters/power_save{,_controller}; do \
     printf " ${i}\n$(cat ${i})\n"; done | sed 's|/sys/module/||g; s|/parameters/.*||g; s|/.*||g; N;s|\n|\t|'
 
-  printf "\nNetwork device powersaving\n/sys/class/net/{wl*,e*,*/device/power/wakeup}\n";
+  printf "\nNetwork device powersaving\n";
   [[ -n "$(command -v iw)" ]] && \
     for i in /sys/class/net/wl*; do \
-      printf " ${i}\n$(iw dev $(printf ${i} | sed 's/^.*wl/wl/') get power_save)"; done | sed 's|^\t|  |g;s|/sys/class/net/||g; s|/.*||g'
+      printf " ${i}\n$(iw dev $(printf ${i} | sed 's/^.*wl/wl/') get power_save)\n"; done | sed 's|^\t|  |g;s|/sys/class/net/||g; s|/.*||g'
+
+  printf "\nWake on {W,}LAN\n/sys/class/net/{wl*,e*,*/device/power/wakeup}\n";
   [[ -n "$(command -v ethtool)" ]] && \
     for i in /sys/class/net/e*; do \
-      printf " ${i}\n$(ethtool $(printf ${i} | sed 's/^.*e/e/') | grep Wake-on)"; done | sed 's|^\t|  |g;s|/sys/class/net/||g; s|/.*||g'
+      printf " ${i}\n$(ethtool $(printf ${i} | sed 's/^.*e/e/') | grep Wake-on)\n"; done | sed 's|^\t|  |g;s|/sys/class/net/||g; s|/.*||g'
   for i in /sys/class/net/*/device/power/wakeup; do \
     printf " ${i}\n$(cat ${i})\n"; done | sed 's|/sys/class/net/||g; s|/device/power/wakeup||g; s|/.*||g; N;s|\n|\t|'
 
@@ -278,14 +277,14 @@ while (( "$#" )); do
       [[ -n "${SHIFT}" ]] && shift "${SHIFT}" || shift
       unset NVPM SHIFT
     ;;
-    full|performance|true|1|start|cut|powersave|false|0|stop)
+    full|performance|start|cut|powersave|stop)
       case "${1}" in
-        full|performance|false|0|stop)
-          [[ -f /etc/throttle.d/performance ]] && . /etc/throttle.d/performance || config_help
-        ;;
-        cut|powersave|true|1|start)
+        cut|powersave|start)
           [[ -f /etc/throttle.d/powersave ]] && . /etc/throttle.d/powersave || config_help
         ;;
+        full|performance|stop)
+          [[ -f /etc/throttle.d/performance ]] && . /etc/throttle.d/performance || config_help
+        ;;
       esac
 
       throttle_ht