removing double quotes + divers petits bugs
This commit is contained in:
		@@ -79,10 +79,10 @@ secretGen(){
 | 
			
		||||
		# rien à faire dans ce fichier, on passe
 | 
			
		||||
	else
 | 
			
		||||
		echo "Remplissage $FILENAME" >& $SORTIESTANDARD
 | 
			
		||||
		db="$1$(apg -n 1 -m 2 -M NCL | cut -c 1-2)"
 | 
			
		||||
		db="$(apg -n 1 -m 2 -M NCL | cut -c 1-2)"
 | 
			
		||||
		pass="$(apg -n 1 -m 16 -M NCL)"
 | 
			
		||||
		token="$(apg -n 1 -m 32 -M NCL)"
 | 
			
		||||
		user="$1$(apg -n 1 -m 2 -M NCL | cut -c 1-2)"
 | 
			
		||||
		user="$(apg -n 1 -m 2 -M NCL | cut -c 1-2)"
 | 
			
		||||
 | 
			
		||||
		dbs=$(grep -Eo '@@db@@[^@]*@@d@@' $FILENAME | sed -e 's/@@db@@//' -e 's/@@d@@//')
 | 
			
		||||
		passwords=$(grep -Eo '@@pass@@[^@]*@@p@@' $FILENAME | sed -e 's/@@pass@@//' -e 's/@@p@@//')
 | 
			
		||||
@@ -90,11 +90,11 @@ secretGen(){
 | 
			
		||||
		users=$(grep -Eo '@@user@@[^@]*@@u@@' $FILENAME | sed -e 's/@@user@@//' -e 's/@@u@@//')
 | 
			
		||||
		globalvars=$(grep -Eo '@@globalvar@@[^@]*@@gv@@' $FILENAME | sed -e 's/@@globalvar@@//' -e 's/@@gv@@//')
 | 
			
		||||
 | 
			
		||||
		for dbName in $dbs; do sed -i "s/@@db@@$dbName@@d@@/${dbName}_$db"  $DIR/*; done
 | 
			
		||||
		for pw in $passwords; do sed -i "s/@@pass@@$pw@@p@@/${pw}"  $DIR/*; done
 | 
			
		||||
		for tk in $tokens; do sed -i "s/@@token@@$tk@@t@@/${tk}"  $DIR/*; done
 | 
			
		||||
		for u in $users; do sed -i "s/@@user@@$u@@u@@/${u}_$user"  $DIR/*; done
 | 
			
		||||
		for var in $globalvars; do sed -i "s/@@globalvar@@$var@@gv@@/${!var}"  $DIR/*; done
 | 
			
		||||
		for dbName in $dbs; do $SIMU sed -i "s/@@db@@$dbName@@d@@/${dbName}_$db/"  $DIR/*; done
 | 
			
		||||
		for pw in $passwords; do $SIMU sed -i "s/@@pass@@$pw@@p@@/${pass}/"  $DIR/*; done
 | 
			
		||||
		for tk in $tokens; do $SIMU sed -i "s/@@token@@$tk@@t@@/${token}/"  $DIR/*; done
 | 
			
		||||
		for u in $users; do $SIMU sed -i "s/@@user@@$u@@u@@/${u}_$user/"  $DIR/*; done
 | 
			
		||||
		for var in $globalvars; do $SIMU sed -i "s/@@globalvar@@$var@@gv@@/${!var}/"  $DIR/*; done
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
@@ -115,9 +115,9 @@ crossVarComplete(){
 | 
			
		||||
 | 
			
		||||
		varnames=$(grep -Eo '@@crossvar@@[^@]*@@cv@@' $FILENAME | sed -e 's/@@crossvar@@//' -e 's/@@cv@@//')
 | 
			
		||||
		for varname in $varnames; do 
 | 
			
		||||
			envname=${varname%_}
 | 
			
		||||
			envname=${varname%%_*}
 | 
			
		||||
			value=$(/$KAZ_BIN_DIR/getPasswords.sh -e $varname $envname -d $ORGA)
 | 
			
		||||
			sed -i "s/@@crossvar@@$varname@@cv@@/${value}"  $DIR/*; 
 | 
			
		||||
			$SIMU sed -i "s/@@crossvar@@$varname@@cv@@/${value}/"  $DIR/*; 
 | 
			
		||||
		
 | 
			
		||||
		done
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user