From 7b368aba19e35d2f19c17645fc2e1a4cae34e8a6 Mon Sep 17 00:00:00 2001 From: koksnuss Date: Mon, 14 May 2018 11:29:55 +0200 Subject: [PATCH] somesing --- modules/audio | 11 ++++++----- modules/battery | 14 ++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/audio b/modules/audio index 4f59e7d..87d3f8d 100755 --- a/modules/audio +++ b/modules/audio @@ -1,9 +1,10 @@ #!/bin/bash case ${BLOCK_INSTANCE} in - mic) GET="Capture";; - *) GET="Master";; + mic) DEV="Capture";; + *) DEV="Master";; esac -amixer get $GET | gawk ' +[[ ${BLOCK_BUTTON} == 1 ]] && amixer set $DEV toggle &> /dev/null +amixer get $DEV | gawk ' match($0, /\[([0-9]+)\%\] \[(on|off)\]/, matches) { audio=matches[1] } @@ -13,8 +14,8 @@ amixer get $GET | gawk ' print("off \n") exit 33 } - printf("%d%", audio) - printf("%d", audio) + printf("%d% \n", audio) + printf("%d\n", audio) if (audio < 75) { print("#04B431\n") } else if (audio < 80) { diff --git a/modules/battery b/modules/battery index 5e1b464..29e003f 100755 --- a/modules/battery +++ b/modules/battery @@ -1,7 +1,13 @@ #!/bin/bash -[[ ${BLOCK_INSTANCE} == '' ]] && BATTERY=0 || BATTERY=${BLOCK_INSTANCE} -cat /sys/class/power_supply/BAT${BATTERY}/uevent | gawk -F '=' ' +[[ ${BLOCK_INSTANCE} == '' ]] && BAT=0 || BAT=${BLOCK_INSTANCE} +DIR="/sys/class/power_supply/BAT" +if [ ! -f "${DIR}${BAT}/uevent" ]; then + echo " not found " + echo "n/a" + exit 33 +fi +cat /sys/class/power_supply/BAT${BAT}/uevent | gawk -F '=' ' /POWER_SUPPLY_STATUS=/ { status=$2 } @@ -20,8 +26,8 @@ cat /sys/class/power_supply/BAT${BATTERY}/uevent | gawk -F '=' ' } else { status="" } - printf("%s%d%", status, charge) - print("\n") + printf("%s%d%\n", status, charge) + printf("%s%d\n", status, charge) if (charge > 25) { print("#04B431\n") } else if (charge > 20) {