From ce7ab33e0d253c323549c00b7b7e70684cc8be7c Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 10 Dec 2019 19:24:20 +0000
Subject: [PATCH] PSMS in profile

---
 .install/4-install_playsms.sh | 4 ++--
 .install/templates/.profile   | 2 +-
 install.sh                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.install/4-install_playsms.sh b/.install/4-install_playsms.sh
index 4717c20..6703ba4 100755
--- a/.install/4-install_playsms.sh
+++ b/.install/4-install_playsms.sh
@@ -3,10 +3,10 @@
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
+[[ -f $MY_PATH/../.profile ]] && source $MY_PATH/../.profile
 unset err
 
-echo -e "${c_yellow}Choisissez un nom de domain pour playsms: $c_"
-read PSMS_DOMAIN
+[[ ! $PSMS_DOMAIN ]] && echo -e "${c_yellow}Choisissez un nom de domain pour playsms: $c_" && read PSMS_DOMAIN
 
 sudo apt -y update
 if [[ $(grep buster /etc/os-release) ]]; then
diff --git a/.install/templates/.profile b/.install/templates/.profile
index 8af8300..c7a7778 100644
--- a/.install/templates/.profile
+++ b/.install/templates/.profile
@@ -4,4 +4,4 @@ ADMINPSEUDO=
 ADMINPHONE=
 MASTERPHONE=
 ADRESSE=
-PSMS=
+PSMS_DOMAIN=
diff --git a/install.sh b/install.sh
index 16e9716..77c3666 100755
--- a/install.sh
+++ b/install.sh
@@ -8,6 +8,7 @@ MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 init_loc="$MY_PATH/shell/init.sh"
 now=$(date +%Y-%m-%d)
+[[ -f $MY_PATH/.profile ]] && source $MY_PATH/.profile
 
 args="$@"
 [[ $args =~ all ]] && repOption=o
@@ -42,7 +43,6 @@ fi
 echo -e "${c_yellow}Ce script va désormais configurer votre noeud G1sms+$c_"
 YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
 
-[[ -f .profile ]] && source .profile
 if [[ -f $MY_PATH/.install/templates/init.sh ]]; then
     [[ ! $ADMINPSEUDO ]] && echo -e "${c_light}Votre PSEUDO? (celui de votre Compte membre Duniter)$c_" && read ADMINPSEUDO
     [[ "$ADMINPSEUDO" == "" ]] && echo -e "${c_red}IMPOSSIBLE DE CONTINUER$c_" && exit 1