From d07354218ecdef760e87d84c497e14ec70387837 Mon Sep 17 00:00:00 2001
From: Slava <rik.slava@gmail.com>
Date: Fri, 16 Aug 2019 13:06:08 +0300
Subject: [PATCH] updated 30-hdd-temp, now worcking from smartctl

---
 30-hdd-free | 4 ++--
 30-hdd-temp | 4 ++--
 40-services | 2 +-
 50-flexget  | 2 +-
 60-docker   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/30-hdd-free b/30-hdd-free
index d760afe..b6a7a90 100644
--- a/30-hdd-free
+++ b/30-hdd-free
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-mountpoints=('/mnt/sdb1' '/')
+mountpoints=('/mnt/sdb1' '/' '/mnt/backup/')
 barWidth=50
 maxDiscUsage=90
 clear="\e[39m\e[0m"
@@ -9,7 +9,7 @@ barclear=""
 echo 
 
 for point in "${mountpoints[@]}"; do
-    line=$(df -h "${point}")
+    line=$(df -hl "${point}")
     usagePercent=$(echo "$line"|tail -n1|awk '{print $5;}'|sed 's/%//')
     usedBarWidth=$((($usagePercent*$barWidth)/100))
     barContent=""
diff --git a/30-hdd-temp b/30-hdd-temp
index 4488a9c..fbff5ee 100644
--- a/30-hdd-temp
+++ b/30-hdd-temp
@@ -1,11 +1,11 @@
 #!/bin/bash
-sd=(sda sdb sdc sdd sde)
+sd=(sda sdb sdc sdd sde sdf)
 out=""
 clear="\e[0m\e[39m"
 
 my_target_temp=45
 for i in ${!sd[@]}; do
-    temp=$(hddtemp -nq /dev/${sd[$i]} 2> /dev/null)
+    temp=$(smartctl -a /dev/${sd[$i]} | grep Temperature_Celsius	| awk '{print $10}' 2> /dev/null)
     color="\e[42m"
     if [ "$temp" -ge "${my_target_temp}" ]; then
         color="\e[41m"
diff --git a/40-services b/40-services
index e17a764..e917fc0 100644
--- a/40-services
+++ b/40-services
@@ -6,7 +6,7 @@ COLUMNS=3
 green="\e[1;32m"
 red="\e[1;31m"
 undim="\e[0m"
-services=( "smartd" "plexmediaserver" "deluge-web" "deluged" "smbd" "minecraft@gregtech")
+services=( "smartd" "plexmediaserver" "docker" "smdb")
 # sort services
 IFS=$'\n' services=($(sort <<<"${services[*]}"))
 unset IFS
diff --git a/50-flexget b/50-flexget
index 770666f..09e945c 100644
--- a/50-flexget
+++ b/50-flexget
@@ -2,4 +2,4 @@
 
 echo "
 Flexget ACCEPTED:"
-tail -n 10 /home/server/.flexget/accepted.log | column -ts %
+tail -n 5 /home/server/docker/flexget/config/accepted.log | column -ts %
diff --git a/60-docker b/60-docker
index cc8dd75..06cc052 100755
--- a/60-docker
+++ b/60-docker
@@ -7,7 +7,7 @@ green="\e[1;32m"
 red="\e[1;31m"
 undim="\e[0m"
 
-mapfile -t containers < <( docker ps --format "{{.Names}}: {{.Status}}" -a | awk '{ print $1,$2 }' | sed '/^\s*$/d' | tail -n +1)
+mapfile -t containers < <( docker ps --format "{{.Names}} {{.Status}}" -a | awk '{ print $1,$2 }' | sed '/^\s*$/d' | tail -n +1)
 
 IFS=$'\n' containers=($(sort <<<"${containers[*]}"))
 unset IFS