diff --git a/grabber.sh b/grabber.sh index bdc0eef..781fd1c 100755 --- a/grabber.sh +++ b/grabber.sh @@ -22,7 +22,8 @@ echo " ++++++++++++++++++++++++++++++++++" echo " + Welcome to Grabber +" echo " ++++++++++++++++++++++++++++++++++" echo " " - +echo "Hello $USER !" +echo ". . ." echo "Tout les fichiers crées se trouveront dans le dossier /opt/grabber ;)" echo " " @@ -40,33 +41,43 @@ FILES=( declare -A COMMANDES COMMANDES=( - "lspci.cmd" "lspci -nn" - "lsusb.cmd" "lsusb" - "apt.cmd" "apt list --installed" - "systemd-analyze.cmd" "systemd-analyze" - "systemd-blame.cmd" "systemd-analyze blame | head -n 10" - "lscpu.cmd" "lscpu" - "inxi.cmd" "inxi" - "lsmem.cmd" "lsmem" + [lspci.cmd]="lspci -nn" + [lsusb.cmd]="lsusb" + [apt.cmd]="apt list --installed" + [systemd-analyze.cmd]="systemd-analyze" + [systemd-blame.cmd]="systemd-analyze blame | head -n 10" + [lscpu.cmd]="lscpu" + [inxi.cmd]="inxi" + [lsmem.cmd]="lsmem" ) treat_cmd() { - echo "Création fichier: $@" - $2 |grep -v '^#' |grep -v '^$' >$DIR/$1 + echo "Création fichier: $@" + $2 >$DIR/$1 + if [ $? -eq 0 ]; then + echo "[OK]: Fichier $1 généré" > $SUCCESS_LOG + else + echo "[ECHEC]: Erreur à la génération de $1 => Code de sortie $?" > $ERROR_LOG + fi } treat_file() { echo "Copie de fichier: $@" cat $2 |grep -v '^#' |grep -v '^$' >$DIR/$1 + if [ $? -eq 0 ]; then + echo "[OK]: Fichier $1 généré" >> $SUCCESS_LOG + else + echo "[ECHEC]: Erreur à la génération de $1 => Code de sortie $?" >> $ERROR_LOG + fi } -for cmd in ${!COMMANDES[@]}; do - treat_cmd $cmd ${COMMANDES[$cmd]} +for cmd in "${!COMMANDES[@]}"; do + treat_cmd $cmd "${COMMANDES[$cmd]}" done -for file in ${!FILES[@]}; do - treat_file $file ${FILES[$file]} +for file in "${!FILES[@]}"; do + treat_file $file "${FILES[$file]}" done @@ -82,12 +93,6 @@ echo "Combien de disques sur l'ordinateur ? ${#DEVICES[@]}" echo "keys: ${!PARTITIONS_BY_DISK[@]}" echo "values: ${PARTITIONS_BY_DISK[@]}" -echo DEVICES=${DEVICES[@]} >$SUM - -for disk in ${!PARTITIONS_BY_DISK[@]}; do - echo "PARTS_$disk=$(printf '%s ' ${PARTITIONS_BY_DISK[$disk]})" >>$SUM -done - hardware() { @@ -108,7 +113,7 @@ hardware() { done STOCKAGE_TOTAL=$(numfmt --to iec $STOCKAGE_TOTAL) echo "STOCKAGE_TOTAL=$STOCKAGE_TOTAL" -} >>$SUM +} >$SUM software() { @@ -124,5 +129,5 @@ software() { hardware software echo " " -echo "Fichier summary.txt a été crée avec les infos hardware et software du système" +echo "Le fichier summary.txt contient les infos hardware et software du système" echo "À bientôt ;)"