From b46aa7e31e561ca6fba0e26709559c959bb644cf Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 11 May 2020 15:16:32 +0200
Subject: [PATCH] root OR pi

---
 g1sms/init.sh         | 10 +---------
 g1sms/sms_received.sh |  6 +++++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/g1sms/init.sh b/g1sms/init.sh
index 0c46ed8..becde7b 100755
--- a/g1sms/init.sh
+++ b/g1sms/init.sh
@@ -8,15 +8,7 @@ MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
 YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
-if [[ $(whoami) == "root" ]]; then
-    su - $YOU
-    cd $MY_PATH
-    export IPFSNODEID=$(ipfs id -f='<id>\n')
-    #chown -R $YOU /tmp/zen/
-    #chown $YOU /tmp/g1sms.log
-else
-    export IPFSNODEID=$(ipfs id -f='<id>\n')
-fi
+export IPFSNODEID=$(ipfs id -f='<id>\n')
 [[ $IPFSNODEID == "" ]] && echo "PROBLEM GETTING IPFSNODEID" && exit 1
 
 [[ ! $(which bc) ]] && sudo apt-get install bc -y ## TODO: migration need TO REMOVE
diff --git a/g1sms/sms_received.sh b/g1sms/sms_received.sh
index d23250c..80a6548 100755
--- a/g1sms/sms_received.sh
+++ b/g1sms/sms_received.sh
@@ -7,11 +7,15 @@
 
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
 
+if [[ $(whoami) == "root" ]]; then
+    su - $YOU
+    cd $MY_PATH
+fi
 # Execute Kalkun daemon
 [[ -f /var/www/kalkun/scripts/daemon.sh ]] && /var/www/kalkun/scripts/daemon.sh
 
-export YOU=$(ps aux --sort=+utime | grep ipfs | tail -n 1 | cut -d " " -f 1)
 cd $MY_PATH
 source ./init.sh
 source ./functions.sh