From 455ef72bd9db413e22a959061564ce82f82c71b4 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 24 Aug 2021 15:34:30 +0200
Subject: [PATCH] Gardez ou modifiez ce Pseudo? $XZUID

---
 ISOconfig.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ISOconfig.sh b/ISOconfig.sh
index b647b4a..a540b5e 100755
--- a/ISOconfig.sh
+++ b/ISOconfig.sh
@@ -47,13 +47,14 @@ fi
 echo "CREATING Gchange credentials"
 ########################################################################
 salt="$(~/.zen/astrXbian/zen/tools/diceware.sh 3 | xargs)"
+salto="$salt"
 [[ $salt == "" ]] && echo "ERROR" && exit 1
 pepper="$(~/.zen/astrXbian/zen/tools/diceware.sh 3 | xargs)"
 XZUID=$(~/.zen/astrXbian/zen/tools/diceware.sh 1 | xargs)${RANDOM:0:2}$(~/.zen/astrXbian/zen/tools/diceware.sh 1 | xargs)
 
-[[ "$USER" != "xbian" ]] && echo "Modifier identifiant (passphrase 1)? $salt" && read salty && [[ $salty ]] && salt="$salty"  
-[[ "$USER" != "xbian" ]] && echo "Modifier mot de passe (passphrase 2)? $pepper" && read peppery && [[ $peppery ]] && pepper="$peppery"  
-# [[ "$USER" != "xbian" ]] && echo "Modifier Pseudo? $XZUID" && read XZUIDy && [[ $XZUIDy ]] && XZUID="$XZUIDy"  
+[[ "$USER" != "xbian" ]] && echo "Gardez ou modifiez cet identifiant (passphrase 1)? $salt" && read salty && [[ $salty ]] && salt="$salty"
+[[ "$USER" != "xbian" ]] && echo "Gardez ou modifiez cet mot de passe (passphrase 2)? $pepper" && read peppery && [[ $peppery ]] && pepper="$peppery"
+[[ "$USER" != "xbian" &&  "$salt" != "$salto" ]] && echo "Gardez ou modifiez ce Pseudo? $XZUID" && read XZUIDy && [[ $XZUIDy ]] && XZUID="$XZUIDy"
 
 g1_salt="$salt"
 g1_pepper="$pepper"
@@ -221,9 +222,9 @@ echo 'Installing Astroport cron_MINUTE'
 ~/.zen/astrXbian/zen/cron_VRFY.sh
 
 ########################################################################
-#echo "CHANGE hostname" 
+#echo "CHANGE hostname"
 #myname=$(cat ~/.zen/ipfs/.$IPFSNODEID/_xbian.zuid)
-#echo "$(hostname). Changez votre HOSTNAME ($myname)?" && read mynamey && [[ $mynamey ]] && myname="$mynamey"  
+#echo "$(hostname). Changez votre HOSTNAME ($myname)?" && read mynamey && [[ $mynamey ]] && myname="$mynamey"
 ########################################################################
 #sudo sed -i "s/$(hostname)/$myname/g" /etc/hostname
 #sudo sed -i "s/$(hostname)/$myname/g" /etc/hosts
@@ -240,7 +241,7 @@ sudo chattr -i /etc/resolv.conf
 sudo cat > /tmp/resolv.conf <<EOF
 domain home
 search home
-nameserver 80.67.169.12   
+nameserver 80.67.169.12
 nameserver 80.67.169.40
 nameserver 94.247.43.254
 nameserver 2001:67c:13e4:1::37