From 94bb742978ebfd81b037dc7f02a78028af38bd1f Mon Sep 17 00:00:00 2001
From: kyodev <kyodev@yandex.fr>
Date: Mon, 16 Oct 2017 21:28:29 +0200
Subject: [PATCH] sdeb 1.1.0

---
 scripts/sdeb | 58 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/scripts/sdeb b/scripts/sdeb
index 6d21d74..880f352 100755
--- a/scripts/sdeb
+++ b/scripts/sdeb
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=1.0.0
+version=1.1.0
 date=16/10/2017
 
 f__color(){		# 08/10/2017
@@ -45,7 +45,7 @@ f__sudo(){		# 11/10/2017
 	fi
 	[ "$2" ] && nb="$2"
 	for (( isudo=1 ; isudo<="$nb" ; isudo++ )); do 
-		$sudo " $1"
+		$sudo "$1"
 		[ "$?" == 0 ] && break
 		[ "$isudo" == "$nb" ] && return 1
 	done
@@ -66,13 +66,14 @@ f__pause(){		# 24/09/2017
 }
 
 help(){		# 16/10/2017
-	echo "$BOLD"
-	echo "    téléchargement et installation scripts sdeb"
-	echo "$STD      $version"
+	echo "$BOLD      téléchargement et installation scripts$STD"
 	echo 
-	echo "  $0 all | script get..."
+	echo 
+	echo "  $0 all | script getX"
 	echo
 	echo "     si all : traitements de tous les scripts"
+	echo "     script getX: $(tr ' ' '|' <<< $liste)"
+	echo
 	echo "     si option incorrecte: affichage de cette aide"
 	echo
 	exit 1
@@ -83,16 +84,11 @@ start(){		# 16/10/2017
 	if [ "$(which figlet)" ]; then
 		echo -e "$BOLD"
 		figlet -w120 "  script sdeb" | tr '`' "'" 
-		echo -e "$STD"
+		printf "$STD"
 	else
-		echo -e "$BOLD\nscripts sdeb"
-		echo -e "=============\n$STD"
-	fi
-	if [ $EUID -ne 0 ]; then
-		echo "vous devez être ROOT pour installer les scripts dans le système"
-		f__sudo "exec ./sdeb"
-		exit 0
+		echo -e "$BOLD\n  scripts sdeb$STD"
 	fi
+	echo -e "      $(basename $0) $version\n"
 }
 
 download(){		# 16/10/2017
@@ -102,23 +98,29 @@ download(){		# 16/10/2017
 	[ "$1" == "getFirefox" ] && url="https://framagit.org/kyodev/kyopages/raw/master/scripts/getFirefox"
 	[ "$1" == "getFlashPlayer" ] && url="https://framagit.org/kyodev/kyopages/raw/master/scripts/getFlashPlayer"
 	[ "$1" == "getThunderbird" ] && url="https://framagit.org/kyodev/kyopages/raw/master/scripts/getThunderbird"
-	wget -O "$1" "$url"
+	wget -nv -O "$1" "$url"
 	chmod +x "$1"
+#  -q,  --quiet   -nv, --no-verbose
 }
 
 install(){		# 16/10/2017
-	[ -e "$1" ] && "./essai$1 -i"
-	f__pause 10
+	if [ -e "$1" ]; then
+		./$1 -i
+		f__pause 10
+	else
+		echo "  $1 absent"
+	fi
+	echo
 }
 
 #------ départ script ----------------------------------------------------------
-start 
+liste="getInfo getIp getFirefox getFlashPlayer getThunderbird"
 	# traitement options
 [[ "$1" =~ ^get || "$1" == "all" ]] || help		# si appel incorrect, help
-liste="getInfo getIp getFirefox getFlashPlayer getThunderbird"
+[[ $* =~ --quiet ]] || start
 
-echo -e "$BOLD\n chargement des scripts$STD\n"
-if f__dialog_oui_non "oui" "charger les scripts?"; then 
+echo -e "$BOLD\n  chargement des scripts$STD\n"
+if f__dialog_oui_non "oui" "  charger les scripts?"; then 
 	if [ "$1" == "all" ];then 
 		for ifile in $liste; do
 			download "$ifile"
@@ -128,17 +130,21 @@ if f__dialog_oui_non "oui" "charger les scripts?"; then
 	fi
 fi
 
-echo -e "$BOLD\ninstallation des scripts$STD\n"
-if f__dialog_oui_non "oui" "installer les scripts?" ; then
+echo -e "$BOLD\n  installation des scripts$STD\n"
+if f__dialog_oui_non "oui" "  installer les scripts?" ; then
+	if [ $EUID -ne 0 ]; then
+		echo "  vous devez être ROOT pour installer les scripts dans le système"
+		f__sudo "./sdeb $* --quiet"
+		exit 0
+	fi
 	if [ "$1" == "all" ];then 
 		for ifile in $liste; do
-			[ -e "$ifileS" ] && install "$ifile" || echo "$ifile absent"
+			install "$ifile"
 		done
 	else
-		[ -e "$ifile" ] && install "$1" || echo "$1 absent"
+		install "$1"
 	fi
 fi
-echo
 
 exit 0