Hide GOPATH dir

[khome.git] / home / lib / login_functions.sh

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index 8e25bc0..1f69061 100644 (file)
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -334,7 +334,7 @@ EOF
 
 work_log() {
     mkdir -p "$DIR_WORK_LOG"
-    local -r file_work_log_today="${DIR_WORK_LOG}/$(date +%F).md"
+    local -r file_work_log_today="${DIR_WORK_LOG}/daily-$(date +%F).md"
     if [ ! -f "$file_work_log_today" ]
     then
         work_log_template > "$file_work_log_today"
@@ -556,22 +556,37 @@ status() {
 
     echo
 
+    local _dir temp_input label_file label
+
     printf '%sthermal\n' "$indent_unit"
-    for _dir in /sys/class/thermal/thermal_zone*
-    do
-        printf '%s %.2f C\n' \
-            $(cat "$_dir"/type) \
-            $(( $(cat "$_dir"/temp) / 1000 ))
+    for _dir in /sys/class/hwmon/hwmon*; do
+        cat "$_dir"/name
+        find "$_dir"/ -name 'temp*_input' \
+            | while read -r temp_input; do
+                label_file=${temp_input//_input/_label}
+                if [ -f "$label_file" ]; then
+                    label=$(< "$label_file")
+                else
+                    label=''
+                fi
+                awk -v label="$label" '{
+                        if (label)
+                            label = sprintf(" (%s)", label)
+                            printf("%.2f°C%s\n", $1 / 1000, label)
+                    }' \
+                    "$temp_input"
+            done \
+            | sort \
+            | indent "$indent_unit"
     done \
-    | column -t \
     | indent "${indent_unit}${indent_unit}"
 
     echo 'net'
-    local -r internet_addr=$(internet_addr 0.5)
-    local -r internet_ptr=$(host -W 1 "$internet_addr" | awk 'NR == 1 {print $NF}' )
+    #local -r internet_addr=$(internet_addr 0.5)
+    #local -r internet_ptr=$(host -W 1 "$internet_addr" | awk 'NR == 1 {print $NF}' )
 
-    echo "${indent_unit}internet"
-    echo "${indent_unit}${indent_unit}$internet_addr  $internet_ptr"
+    #echo "${indent_unit}internet"
+    #echo "${indent_unit}${indent_unit}$internet_addr  $internet_ptr"
     echo "${indent_unit}if"
     (ifconfig; iwconfig) 2> /dev/null \
     | awk '