Kill more thoroughly

[khatus.git] / x4 / sanity_check

diff --git a/x4/sanity_check b/x4/sanity_check
index 125369a..4250b5a 100755 (executable)
--- a/x4/sanity_check
+++ b/x4/sanity_check
@@ -12,17 +12,18 @@ sensors_kill_all() {
         kill -9 $(cat $pid_file) || true
         rm $pid_file
     done
-    pkill khatus_x4_sensor || true
+    pkill khatus_x4 || true
 }
 
 sensors_fork_all() {
-    ./bin/khatus_x4_sensor_datetime &
-    ./bin/khatus_x4_sensor_bluetooth&
-    ./bin/khatus_x4_sensor_mpd      &
-    ./bin/khatus_x4_sensor_energy   &
-    ./bin/khatus_x4_sensor_memory   &
-    ./bin/khatus_x4_sensor_loadavg  &
-    ./bin/khatus_x4_sensor_temp -i 1 -- -z 0 &
+    ./bin/khatus_x4_sensor_datetime  -d -i 1
+    ./bin/khatus_x4_sensor_bluetooth -d -i 1
+    ./bin/khatus_x4_sensor_mpd       -d -i 1
+    ./bin/khatus_x4_sensor_energy    -d -i 1
+    ./bin/khatus_x4_sensor_memory    -d -i 1
+    ./bin/khatus_x4_sensor_loadavg   -d -i 1
+    ./bin/khatus_x4_sensor_temp      -d -i 1 -- -z 0
+    ./bin/khatus_x4_sensor_disk      -d -i 1 -- -f /
 }
 
 sensor_read_one() {
@@ -46,7 +47,8 @@ sensors_read_all() {
         mem="$(sensor_read_one ${dir}/khatus_x4_sensor_memory/out/percent_used)"
         load="$(sensor_read_one ${dir}/khatus_x4_sensor_loadavg/out/load_avg_1min)"
         temp="$(sensor_read_one ${dir}/khatus_x4_sensor_temp/out/thermal_zone0)"
-        echo "E[${battery_state} ${battery_percentage}] M:${mem}% L:${load} T:${temp}°C [${mpd}] [$bluetooth_controllers $bluetooth_devices] ${datetime}"
+        disk="$(sensor_read_one ${dir}/khatus_x4_sensor_disk/out/disk_usage_percentage)"
+        echo "E[${battery_state} ${battery_percentage}] M:${mem}% L:${load} T:${temp}°C D:${disk}% [${mpd}] [$bluetooth_controllers $bluetooth_devices] ${datetime}"
         sleep 1
     done
 }