mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.53.2
This commit is contained in:
kyodev
parent
15ff733dc8
commit
4a9f738428
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=2.53.1
|
||||
version=2.53.2
|
||||
date="03/12/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
|
|
@ -458,29 +458,25 @@ f_dspl_scandir(){ # 21/10/2017
|
|||
# option 'noinexist' pas de titre si fichier inexistant
|
||||
# option 'lignevide', pas de suppression des lignes vides
|
||||
# option 'date', date de modification du fichier
|
||||
# option 'commentXY', commentaire supplémentaire à filtrer, ex: comment//, incompatible avec larg.colonne
|
||||
# option 'commentXY', commentaire supplémentaire à filtrer, ex: comment//
|
||||
# ex. cumul option: "10 novide nofile lignevide"
|
||||
# cmd de base: grep -Ersv '^#|^$' file|dossier "options"
|
||||
f_grep_file(){ # 3/12/2017
|
||||
local file content display motif
|
||||
|
||||
if [[ "$2" =~ lignevide ]]; then
|
||||
motif= "^[[:blank:]]*#"
|
||||
elif [[ "$2" =~ comment ]]; then
|
||||
comment=${2#comment} # on garde les symboles de commentaires
|
||||
motif="^[[:blank:]]*$comment|^[[:blank:]]*#|^[[:blank:]]*$"
|
||||
else
|
||||
motif="^[[:blank:]]*#|^[[:blank:]]*$" # motif de base
|
||||
fi
|
||||
|
||||
local file content display
|
||||
for file in $1; do
|
||||
# contenu
|
||||
if [[ "${2,,}" =~ lignevide ]]; then
|
||||
content=$( grep -Ersv '^[[:blank:]]*#' "$file" 2>&1)
|
||||
elif [[ "${2,,}" =~ comment ]]; then
|
||||
comment=${2#comment}
|
||||
content=$( grep -Ersv "^[[:blank:]]*$comment|^[[:blank:]]*#|^[[:blank:]]*$" "$file" 2>&1)
|
||||
else
|
||||
content=$( grep -Ersv '^[[:blank:]]*#|^[[:blank:]]*$' "$file" 2>&1)
|
||||
fi
|
||||
if [[ "$2" =~ [0-9] ]]; then # si $2 contient des chiffres (largeur), gawk
|
||||
content=$(gawk -v "larg=${2//[[:alpha:]]}" '
|
||||
/^[[:graph:]]/ { printf "%-"larg"s",$1; $1=""; printf "%s\n",$0 } # graph exclut ligne vide ou retour grep vide
|
||||
' <<< "$content")
|
||||
else
|
||||
content=$( grep -Ersv $motif "$file" 2>&1)
|
||||
fi
|
||||
[ -d "$file" ] && file+='/' # si répertoire, ajout / final, joli
|
||||
content=${content//$file} # joli, suppression de $file dans les noms de fichiers entete grep
|
||||
|
|
@ -542,17 +538,19 @@ toDisplay=(
|
|||
echo -e "$STD\n plus d'infos: $GREEN$urlNotice\n$STD"
|
||||
}
|
||||
|
||||
# f_pr "1|1|2|l1|l2|l3|titre1|titre2|hl|quote|flush" "texte" "[CONDITION test]"
|
||||
# f_pr "1|1|2|l1|l2|l3|titre1|titre2|hl|quote|flush" "texte" '[CONDITION test]'
|
||||
# $1:
|
||||
# 1|2|3 indentation, liste à puce
|
||||
# l1|l2|l3 indentation, avec espaces
|
||||
# titre1|titre2|titre3
|
||||
# quote|hl|flush
|
||||
# $2 texte à afficher
|
||||
# $3 test éventuel, CONDITION ok pour afficher
|
||||
# $3 test éventuel, Si CONDITION ok -> affichage
|
||||
# ATTENTION aux éventuelles collision $x dans ce cas:
|
||||
# "[ \"$1\" != \"notitre\" ]" ou "[ $1 != notitre ]" (attention au manque de ")
|
||||
# flush (f_pr flush) inutile si f_d(x) final
|
||||
# $1 type, $2 texte, [$3] test /!\ assigne la variable parent $text
|
||||
f_pr(){ # 01/12/2017
|
||||
f_pr(){ # 1/12/2017
|
||||
local preline='' line='' endline=" \n"
|
||||
|
||||
[[ "$1" == 'titre1' ]] && preline="\n# "
|
||||
|
|
@ -569,7 +567,7 @@ f_pr(){ # 01/12/2017
|
|||
[[ "$line" ]] || line="$2" # utilisation $2 sans traitement à faire
|
||||
|
||||
if [[ "$3" ]]; then
|
||||
eval $3 || return 0 # évaluation de la CONDITION, si erreur sortie
|
||||
eval $3 || return 0 # évaluation de la CONDITION, si erreur: sortie
|
||||
fi
|
||||
|
||||
if [[ "$1" == "hl" ]]; then # <hl>
|
||||
|
|
@ -1331,7 +1329,7 @@ fi_log_xorg(){ # 3/12/2017
|
|||
cmd_logXorg="grep -Es '\(WW\)|\(EE\)|\(\?\?\)' $cmd_logXorg"
|
||||
cmt_logXorg="Xorg.log"
|
||||
###
|
||||
f_pr titre2 "journaux Xorg" '[ "$1" != "notitre" ]'
|
||||
f_pr titre2 "journaux Xorg" "[ \"$1\" != \"notitre\" ]"
|
||||
f_di cmd "$logXorg" "$cmd_logXorg" "$cmt_logXorg"
|
||||
f_dspl_alrt "$info_logs" "info"
|
||||
}
|
||||
|
|
@ -1517,24 +1515,24 @@ fi_pkg_apt(){ #v3 1/12/2017
|
|||
cmd_apt_history="cat /var/log/apt/history.log | tail -n25"
|
||||
cmt_apt_history="25 derniers historiques apt"
|
||||
f_di cmd "$sources" "$cmd_sources" "$cmt_sources"
|
||||
return 0
|
||||
f_di cmd "$apt_prefs" "$cmt_apt_prefs" "$cmt_apt_prefs"
|
||||
f_di cmd "$apt_confs" "$cmd_apt_confs" "$cmt_apt_confs"
|
||||
f_di cmd "$syslog" "$cmd_syslog" "$cmt_syslog"
|
||||
# f_di cmd "$apt_history" "$cmd_apt_history" "$cmt_apt_history"
|
||||
f_di cmd "$( f_grep_file /var/log/unattended-upgrades/* )"
|
||||
IFS=$'\n'
|
||||
essai=($(cat /var/log/apt/history.log | grep -B1 -A2 'unattended-upgrade'))
|
||||
for i in "${!essai[@]}"; do
|
||||
:
|
||||
done
|
||||
# f_di cmd $(echo "${essai[*]}") "$cmt_apt_history"
|
||||
#echo ${#essai[*]}
|
||||
#echo ${essai[0]}
|
||||
#echo ${essai[1]}
|
||||
#echo ${essai[2]}
|
||||
#echo ${essai[3]}
|
||||
IFS="$IFS_INI"
|
||||
return 0
|
||||
IFS=$'\n'
|
||||
essai=($(cat /var/log/apt/history.log | grep -B1 -A2 'unattended-upgrade'))
|
||||
for i in "${!essai[@]}"; do
|
||||
:
|
||||
done
|
||||
# f_di cmd $(echo "${essai[*]}") "$cmt_apt_history"
|
||||
#echo ${#essai[*]}
|
||||
#echo ${essai[0]}
|
||||
#echo ${essai[1]}
|
||||
#echo ${essai[2]}
|
||||
#echo ${essai[3]}
|
||||
IFS="$IFS_INI"
|
||||
fi
|
||||
# avertissement
|
||||
info_update="apt update n'a pas été lancé. vérifier que la date de mise à jour ne soit "
|
||||
|
|
@ -3899,7 +3897,7 @@ for j in $options; do
|
|||
ORIGIN='test'
|
||||
prg_1 "$*"
|
||||
echo -n "•"
|
||||
fi_pkg_apt
|
||||
fi_cpu
|
||||
echo; f_dspl_md "$fileOutput"
|
||||
exit ;; # test
|
||||
-c* | all )
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# changelog getInfo
|
||||
|
||||
|
||||
## 2.53.1 03/12/2017
|
||||
## 2.53.2 03/12/2017
|
||||
|
||||
* fix: fu_user
|
||||
* fix: 2.53.1 push sur un test en cours :(
|
||||
|
||||
## 2.53.0 02/12/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue