diff --git a/g1sms/functions.sh b/g1sms/functions.sh index 54f129a..93f2a1f 100755 --- a/g1sms/functions.sh +++ b/g1sms/functions.sh @@ -340,7 +340,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)" # EMAIL [[ $SMSEMAIL == "" ]] && [[ -f "$GPGMAILFILE" ]] && echo "${IPFSPrivKey}" | gpg -d -q --output "$MAILFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGMAILFILE" && SMSEMAIL=$(cat $MAILFILE) [[ $SMSEMAIL == "" ]] && [[ -f "$MAILFILE.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$MAILFILE.crypt" -o "$MAILFILE" && SMSEMAIL=$(cat $MAILFILE) - log "__SUB:sms_INIT_ACCOUNT: DECODING EMAIL $SMSEMAIL" + log "__SUB:sms_INIT_ACCOUNT: Déchiffrage EMAIL $SMSEMAIL" # EMPTY CLEAR EMAIL FILE [[ $SMSEMAIL != "" ]] && echo "" > "$MAILFILE" diff --git a/g1sms/init.sh b/g1sms/init.sh index d590425..3746070 100755 --- a/g1sms/init.sh +++ b/g1sms/init.sh @@ -7,6 +7,16 @@ 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 + export IPFSNODEID=$(su $YOU -c "ipfs id -f='\n'") + chown -R $YOU /tmp/zen/ + chown $YOU /tmp/g1sms.log +else + export IPFSNODEID=$(ipfs id -f='\n') +fi +[[ $IPFSNODEID == "" ]] && echo "PROBLEM GETTING IPFSNODEID" && exit 1 + [[ ! $(which bc) ]] && sudo apt-get install bc -y ## TODO: migration need TO REMOVE [[ ! -f /tmp/g1sms.log ]] && echo "ASTROPORT G1SMS ACTIVITY" > /tmp/g1sms.log && chmod 777 /tmp/g1sms.log diff --git a/g1sms/init_keys.sh b/g1sms/init_keys.sh index 0545ec5..fbbaf3c 100755 --- a/g1sms/init_keys.sh +++ b/g1sms/init_keys.sh @@ -9,15 +9,6 @@ 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 - export IPFSNODEID=$(su $YOU -c "ipfs id -f='\n'") - chown -R $YOU /tmp/zen/ - chown $YOU /tmp/g1sms.log -else - export IPFSNODEID=$(ipfs id -f='\n') -fi - [[ $IPFSNODEID == "" ]] && echo "PROBLEM GETTING IPFSNODEID" && exit 1 NANODATE=$(date -u +%s%N) #1569692075385428020