From 9378edc09d4a0b9f19ef4314e0de7efa9634d849 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Tue, 3 Aug 2021 04:13:13 +0200
Subject: Support new conky and its dependency lua 5.3

---
 scripts/run_conky.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/run_conky.sh b/scripts/run_conky.sh
index 7648259..e718851 100755
--- a/scripts/run_conky.sh
+++ b/scripts/run_conky.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
 
 if [ "$1" != "start" ]; then
-    killall -9 conky
-    killall -9 rainlendar2
-    killall -9 rainlendar2.bin
+    killall -9 conky &> /dev/null
+    killall -9 rainlendar2 &> /dev/null
+    killall -9 rainlendar2.bin &> /dev/null
 fi
 
 if [ "$1" != "stop" ]; then
-    python2 /opt/scripts/unlock.py gui || exit
+#No way to do it anymore
+    python /opt/scripts/unlock.py gui || exit
 
-    killall -9 gpg-agent
-    pass test
+    killall -9 gpg-agent &> /dev/null
+
+    /opt/scripts/restart-gpg.sh 
+    pass test > /dev/null
 
     conky -q -d -c /etc/conky/sysinfo.conf
     conky -q -d -c /etc/conky/netstat.conf
@@ -20,5 +23,15 @@ if [ "$1" != "stop" ]; then
     # todo should be loaded before forecast
     sleep 0.3
     conky -q -d -c /etc/conky/forecast.conf
-    /opt/rainlendar2/rainlendar2 --quiet &
+
+
+#    sleep 1
+#    ps xa | grep gpg-agent | grep -v gpg &> /dev/null
+#    if [ $? -ne 0 ]; then
+#        /opt/scripts/restart-gpg.sh 
+#    fi
+    
+
+# Temporarily disabled. Only 2.16 works with google now and we don't have license. Might worth buying if use desktop again.
+#    /opt/rainlendar2/rainlendar2 --quiet &
 fi
-- 
cgit v1.2.1