getInfo 2.12.1

scripts/getInfo

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=2.12.0
+version=2.12.1
 date="21/10/2017"
 projet="simpledeb"
 contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
@@ -374,7 +374,6 @@ fi_cpu(){		#v2 21/10/2017
 ###
 	text="## processeur \n\n"
 	f_display "fget_cpu" "sans"
-	f_display "fget_cpu" "sans"
 	f_display "cpu_flags" "var" "flags cpu:"
 }
 
@@ -540,7 +539,7 @@ fi_graph(){		#v2 21/10/2017
 
 fi_hw(){		#v2 21/10/2017
 	figet_hw
-	text="## hardware monitor ACPI \n\n"
+	text="## hardware monitor ACPI  \n\n"
 	f_display "fget_hw" "sans" 
 }
 
@@ -678,19 +677,17 @@ fi_log_xorg(){		#v2 21/10/2017
 		"(Xorg.log)"
 }
 
-fi_mem(){		# 05/10/2017
-	local swappiness text
-	swappiness="$(< /proc/sys/vm/swappiness)"
+fi_mem(){		#v2 21/10/2017
+	local swappiness text tempo
+	swappiness="$(cat /proc/sys/vm/swappiness 2>/dev/null)"
+	figet_mem "mem"		#options possibles mem swap total notitle nocoltitle
+	tempo="$fget_mem  \n\n"
+	figet_mem "swap" "notitle"
+	tempo+="$fget_mem  \n\n"
+	tempo+="swappiness: $swappiness"
 ###
-	text="## processeur / mémoire \n\n"
-	text+='```\n'
-	figet_mem "mem"		#options possibles mem swaptotal notitle nocoltitle
-	text+="$fget_mem \n\n"
-	figet_mem "swap"
-	text+="$fget_mem \n"
-	text+="swappiness: $swappiness \n"
-	text+='```\n\n'
-	echo -e "$text" >> "$fileOutput"
+	text="## mémoire  \n\n"
+	f_display "tempo" "sans" 
 }
 
 fi_nm(){		# 11/10/2017
@@ -1010,9 +1007,9 @@ fi_systeme(){		# 21/10/2017
 	text+="$fget_dmi  \n\n"
 	text+="|    |    |  \n"
 	text+="| --- | --- |  \n"
-	text+="CPU | **$(sed -n '1p' <<< $fget_cpu)**  \n"
-	text+="GPU | **$fget_gpu**  \n"
-	text+="boot | $mbr \n"
+	text+="| CPU | **$(sed -n '1p' <<< $fget_cpu)** |  \n"
+	text+="| GPU | **$fget_gpu** |  \n"
+	text+="| boot | $mbr |  \n\n"
 	text+="distribution | **$fget_distro**  \n"
 	f__architecture || f__info "Architecture non supportée" "vous pouvez contacter $projet, $contact " \
 		"pour aider à parfaire le script"
@@ -2048,7 +2045,7 @@ for j in $options; do
 	case $j  in
 		-t | --test )
 			prg_1 "$*"
-			fi_cpu
+			fi_mem
 			prg_3  
 			exit ;;					# test seulement
 		-c* | all )

scripts/getInfo_changelog.md

@@ -18,7 +18,7 @@
 * f__requis f__wget_test fscript_get_version fscript_update fscript_cronAnacron
 
 
-## 2.12.0 21/10/2017
+## 2.12.1 21/10/2017
 
 * nouveau: ré-écriture figet_cpu (sans température)
 * suppression : figet_cpu neofetch