mirror of https://framagit.org/kyodev/kyopages.git
getInfo 2.45.1
This commit is contained in:
parent
fc4517adb4
commit
c298cf012b
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
version=2.45.0
|
version=2.45.1
|
||||||
date="25/11/2017"
|
date="25/11/2017"
|
||||||
projet="simpledeb"
|
projet="simpledeb"
|
||||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||||
|
@ -8,7 +8,7 @@ script="getInfo"
|
||||||
|
|
||||||
##### license LPRAB/WTFPL
|
##### license LPRAB/WTFPL
|
||||||
# auteur: simpledeb
|
# auteur: simpledeb
|
||||||
# contributeurs: kyodev, saiqui, naguam, agentcobra
|
# contributeurs: kyodev, saiqui, naguam, agentcobra, amilcar
|
||||||
#####
|
#####
|
||||||
|
|
||||||
# assigne $affichage_text
|
# assigne $affichage_text
|
||||||
|
@ -585,8 +585,9 @@ fi_cpu(){ # 19/11/2017
|
||||||
unset text
|
unset text
|
||||||
}
|
}
|
||||||
|
|
||||||
fi_disk(){ # 20/11/2017
|
fi_disk(){ # 25/11/2017
|
||||||
local dd_temp="" temp disk_df disk_df_i disk_lsblk fstab resume idResume idSwap idisk text pluriel
|
local cmd_dd_temp="" dd_temp="" temp disk_df disk_df_i disk_lsblk fstab resume idResume idSwap idisk
|
||||||
|
local text pluriel
|
||||||
local alert_dd_temp alert_file_resume alert_uuidResume
|
local alert_dd_temp alert_file_resume alert_uuidResume
|
||||||
# éventuellement hddtemp
|
# éventuellement hddtemp
|
||||||
if [ $( f__which hddtemp ) ]; then
|
if [ $( f__which hddtemp ) ]; then
|
||||||
|
@ -597,8 +598,10 @@ fi_disk(){ # 20/11/2017
|
||||||
alert_dd_temp+="$idisk: température > 50°C "$'\n'
|
alert_dd_temp+="$idisk: température > 50°C "$'\n'
|
||||||
fi
|
fi
|
||||||
dd_temp+="$idisk: $temp °C"$'\n'
|
dd_temp+="$idisk: $temp °C"$'\n'
|
||||||
|
cmd_dd_temp+=" /dev/$idisk"
|
||||||
done
|
done
|
||||||
[ "$dd_temp" ] && dd_temp=${dd_temp::-1} # suppression dernier $'\n'
|
[ "$dd_temp" ] && dd_temp=${dd_temp::-1} # suppression dernier $'\n'
|
||||||
|
cmd_dd_temp="hddtemp$cmd_dd_temp"
|
||||||
[ "$alert_dd_temp" ] && alert_dd_temp=${alert_dd_temp::-1} # suppression dernier $'\n'
|
[ "$alert_dd_temp" ] && alert_dd_temp=${alert_dd_temp::-1} # suppression dernier $'\n'
|
||||||
fi
|
fi
|
||||||
# df, espaces des partitions montées seules
|
# df, espaces des partitions montées seules
|
||||||
|
@ -658,7 +661,7 @@ fi_disk(){ # 20/11/2017
|
||||||
text+="| :---: | :---: | :---: | :---: | \n"
|
text+="| :---: | :---: | :---: | :---: | \n"
|
||||||
text+="| $fg_disk_ata | $fg_disk_usb | $fg_disk_mmc | $fg_disk_nvme | \n\n"
|
text+="| $fg_disk_ata | $fg_disk_usb | $fg_disk_mmc | $fg_disk_nvme | \n\n"
|
||||||
# éventuellement hddtemp
|
# éventuellement hddtemp
|
||||||
f_display "dd_temp" "cmd" "hddtemp /dev/sd?" "température disques"
|
f_display "dd_temp" "cmd" "$cmd_dd_temp" "température disques"
|
||||||
f_dspl_alert "alert_dd_temp" "info"
|
f_dspl_alert "alert_dd_temp" "info"
|
||||||
# df, espaces des partitions montées seules
|
# df, espaces des partitions montées seules
|
||||||
f_display "disk_df" "cmd" \
|
f_display "disk_df" "cmd" \
|
||||||
|
@ -3198,6 +3201,7 @@ fipaste_curl_pastery(){ # 25/10/2017
|
||||||
[ -e "$1" ] || f__error "fichier $1 inexistant"
|
[ -e "$1" ] || f__error "fichier $1 inexistant"
|
||||||
local curl id pluriel
|
local curl id pluriel
|
||||||
# curl -X POST "https://www.pastery.net/api/paste/?title=getInfo&language=markdown" -F file=@$1
|
# curl -X POST "https://www.pastery.net/api/paste/?title=getInfo&language=markdown" -F file=@$1
|
||||||
|
# un fichier simple curl https://www.pastery.net/api/paste/ -F file=@data.txt
|
||||||
curl="$(curl --silent -X POST "https://www.pastery.net/api/paste/?title=getInfo_$version&language=markdown&duration=$(($2*1440))" --data-binary @$1)"
|
curl="$(curl --silent -X POST "https://www.pastery.net/api/paste/?title=getInfo_$version&language=markdown&duration=$(($2*1440))" --data-binary @$1)"
|
||||||
if grep -q '"result": "error' <<< "$curl" ;then
|
if grep -q '"result": "error' <<< "$curl" ;then
|
||||||
f__info "$RED""Erreur critique export rapport:"
|
f__info "$RED""Erreur critique export rapport:"
|
||||||
|
|
|
@ -4,13 +4,14 @@
|
||||||
* ! f__requis (debOnly), fscript_install, f__scandir
|
* ! f__requis (debOnly), fscript_install, f__scandir
|
||||||
|
|
||||||
|
|
||||||
## 2.45.0 25/11/2017
|
## 2.45.1 25/11/2017
|
||||||
|
|
||||||
* nouveau: gestion no $DISPLAY
|
* nouveau: gestion no $DISPLAY
|
||||||
* révision: version bash en test et affichage
|
* révision: version bash en test et affichage
|
||||||
* révision: figet_shell, fi_systeme, shell & shellS
|
* révision: figet_shell, fi_systeme, shell & shellS
|
||||||
* révision: général, LC_ALL=C oubliés
|
* révision: général, LC_ALL=C oubliés
|
||||||
* révision: figet_wm, fi_graph
|
* révision: figet_wm, fi_graph
|
||||||
|
* révision: fi_disk, affichage hddtemp
|
||||||
* fix: fi_systeme, openSuse uptime
|
* fix: fi_systeme, openSuse uptime
|
||||||
* fix: figet_de, cinnamon
|
* fix: figet_de, cinnamon
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue