mirror of https://framagit.org/kyodev/kyopages.git
0.9.2
This commit is contained in:
parent
bbc219bd59
commit
134bccde79
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=0.9.1
|
||||
version=0.9.2
|
||||
date="06/08/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues"
|
||||
|
@ -12,8 +12,6 @@ urlScript="https://framagit.org/kyodev/kyopages/raw/master/scripts/$script"
|
|||
# contributeurs: kyodev
|
||||
#####
|
||||
|
||||
PATH='/bin:/usr/bin:/sbin' ; IFS=' '
|
||||
|
||||
f__affichage(){
|
||||
# définition couleurs
|
||||
YELLOW="$(printf "\033[0;33m")" # ?
|
||||
|
@ -21,7 +19,6 @@ f__affichage(){
|
|||
BLUE="$(printf "\033[0;34m")" # info
|
||||
RED="$(printf "\033[0;31m")" # alerte
|
||||
COLOR="$(printf "\033[0m")" # standard
|
||||
|
||||
clear
|
||||
printf "$BLUE"
|
||||
cat << 'EOF'
|
||||
|
@ -81,19 +78,14 @@ f__log(){
|
|||
fi
|
||||
}
|
||||
|
||||
# test dépendances (commandes disponibles), $1 liste commandes ou $1...$x, si manquant, avertissement des paquets manquants
|
||||
# test dépendances (commandes disponibles), $1 liste commandes ou $1...$x, si manquant, avertissement des commandes manquantes
|
||||
f__requis(){
|
||||
local dependsFail
|
||||
for i in $@; do
|
||||
if [ ! "$(which $i)" ]; then
|
||||
dependsFail+="$i "
|
||||
fi
|
||||
done
|
||||
[ -z "$dependsFail" ] || f__error "paquet(s) manquant(s)" \
|
||||
"vous devez avoir le(s) paquet(s) $i pour exploiter ce script, installation,$RED en root$COLOR:" \
|
||||
"apt install $dependsFail"
|
||||
for i in $@; do which $i &>/dev/null || dependsFail+="$i "; done
|
||||
[ "$dependsFail" ] && f__error "commandes(s) manquante(s)" " vous devez avoir le(s) commande(s) ""$RED$dependsFail""$BLUE""pour exploiter ce script"
|
||||
}
|
||||
|
||||
|
||||
# root? return 0 else 1
|
||||
f__root(){
|
||||
[ $EUID -eq "0" ] && return 0 || return 1
|
||||
|
@ -159,10 +151,12 @@ fscript_remove(){
|
|||
# version script en ligne, assigne $versionScript, $script_aJour=ok|ko
|
||||
fscript_get_version(){
|
||||
versionScript="$(wget -q --tries=2 --timeout=15 -O - "$urlScript" | grep '^version=' | cut -d '=' -f 2)"
|
||||
if [ "$version" != "$versionScript" ]; then
|
||||
f__info "version script en ligne: $versionScript, mise à jour possible"
|
||||
script_aJour="ko"
|
||||
else script_aJour="ok"; fi
|
||||
if [ "$versionScript" ]; then
|
||||
if [ "$version" != "$versionScript" ]; then
|
||||
f__info "version script en ligne: $versionScript, mise à jour possible"
|
||||
script_aJour="ko"
|
||||
else script_aJour="ok"; fi
|
||||
fi
|
||||
}
|
||||
|
||||
# mise à jour script si dispo
|
||||
|
@ -375,9 +369,9 @@ get_gpu() { # thanks neofetch, assigne $gpu
|
|||
}
|
||||
|
||||
get_ip() { # $ip_local, $gateway, $gateway_type, $gateway_one, $ip_local, $ip_local_type, $ifname, $ifname_type
|
||||
gateway=$(ip route | awk '/default.*via/ {print $3, "pour:", $5}')
|
||||
gateway=$(ip route | awk '/default.*via/ {print $3, "pour", $5}')
|
||||
gateway_one=$(head -n 1 <<< $gateway | awk '{print $1}')
|
||||
ip_local=$(ip route | awk '/proto.*src/ {print $9, "pour:",$3}')
|
||||
ip_local=$(ip route | awk '/proto.*src/ {print $9, "pour",$3}')
|
||||
ifname=$(ip route | awk '/proto.*src/ {print $3}')
|
||||
gateway_type=$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.µ)/\1 (ethernet)/' <<< $gateway)
|
||||
ip_local_type=$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.*)/\1 (ethernet)/' <<< $ip_local)
|
||||
|
@ -984,19 +978,19 @@ fi_paste(){
|
|||
|
||||
|
||||
# initialisation
|
||||
PATH='/bin:/usr/bin:/sbin' ; IFS=' '
|
||||
f__affichage
|
||||
f__user
|
||||
fileOutput="getInfo_rapport.md"
|
||||
rm "$fileOutput" &>/dev/null
|
||||
touch "$fileOutput"
|
||||
chown $user_: "$fileOutput"
|
||||
|
||||
fileLogs="/var/log/sdeb_$script.log"
|
||||
dureePaste=1 # en jour
|
||||
|
||||
prg_1(){ # début
|
||||
# f__requis "gawk"
|
||||
f__requis "gawk"
|
||||
fi__context
|
||||
rm "$fileOutput" &>/dev/null
|
||||
touch "$fileOutput"
|
||||
chown $user_: "$fileOutput"
|
||||
}
|
||||
prg_test(){ # traitements principaux
|
||||
os=$(uname -s)
|
||||
|
@ -1051,7 +1045,7 @@ for (( i=0 ; i<=$# ; i++ )); do
|
|||
--remove | -r ) fscript_remove ;; # suppression du script dans le système
|
||||
--version | -v ) fscript_get_version ;;# version du script, en ligne et exécuté
|
||||
--upgrade | -u )
|
||||
f__log="tests mise à jour"
|
||||
f__log="test mise à jour"
|
||||
fscript_get_version
|
||||
fscript_dl ;; # upgrade script si maj possible
|
||||
--cnx | -c ) fi_cnx ;; # affiche connexion wifi en cours
|
||||
|
|
Loading…
Reference in New Issue