mirror of https://framagit.org/kyodev/kyopages.git
1.11.0
This commit is contained in:
kyodev
parent
729eddf790
commit
b1db95c342
217
scripts/getIp
217
scripts/getIp
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=1.10.0
|
||||
date="23/09/2017"
|
||||
version=1.11.0
|
||||
date="08/10/2017"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getIp"
|
||||
|
|
@ -14,35 +14,48 @@ urlNotice="https://kyodev.frama.io/kyopages/scripts/getIp/"
|
|||
#####
|
||||
|
||||
f__affichage(){ # 27/08/2017 définition couleurs
|
||||
YELLOW="$(printf "\033[0;33m")" # ?
|
||||
GREEN="$(printf "\033[0;32m")" # ok
|
||||
BLUE="$(printf "\033[0;34m")" # info
|
||||
RED="$(printf "\033[0;31m")" # alerte
|
||||
COLOR="$(printf "\033[0m")" # standard
|
||||
f__color
|
||||
}
|
||||
|
||||
f__color(){ # 08/10/2017
|
||||
YELLOW=$(tput setaf 3) # question
|
||||
GREEN=$(tput setaf 2) # ok
|
||||
BLUE=$(tput setaf 4) # info
|
||||
RED=$(tput setaf 1) # alerte
|
||||
STD=$(tput sgr0) # retour normal
|
||||
MAGENTA=$(tput setaf 5)
|
||||
CYAN=$(tput setaf 6)
|
||||
BOLD=$(tput bold)
|
||||
ITAL=$(tput sitm)
|
||||
SOUL=$(tput smul)
|
||||
}
|
||||
|
||||
# affichage $1 en rouge, $1++ optionnels en bleu, sortie script sur erreur, log $1 si $opType=upgrade
|
||||
f__error() { # 22/09/2017
|
||||
echo -e "\n$RED $script $version, erreur critique: $1 $COLOR"
|
||||
for (( i=2 ; i<=$# ; i++ )); do echo -e " $BLUE${!i}"; done
|
||||
f__error(){ # 08/10/2017
|
||||
echo -e "\n$RED $script $version, erreur critique: $1 $STD"
|
||||
for (( i=2 ; i<=$# ; i++ )); do
|
||||
echo -e " $BLUE${!i}$STD"
|
||||
done
|
||||
unset i
|
||||
echo "$COLOR"
|
||||
echo
|
||||
if [ "$opType" == "upgrade" ]; then f__log "$script $version: $1"; fi
|
||||
exit 1
|
||||
}
|
||||
|
||||
# affichage des paramètres en bleu, si $1=raw pas de ligne vide à la fin, si $1=log uniquement $2 logué
|
||||
f__info() { # 22/09/2017
|
||||
# affichage des paramètres en bleu, si $1=raw pas de ligne vide à la fin, si $1=log alors uniquement $2 logué
|
||||
f__info(){ # 08/10/2017
|
||||
local depart=1
|
||||
if [ "$1" == "raw" ] || [ "$1" == "log" ]; then depart=2; fi
|
||||
[ "$1" == "log" ] && f__log "$(sed -E 's/\\t//;s/\\n// ' <<< $2 | xargs )"
|
||||
for (( i=$depart ; i<=$# ; i++ )); do echo -e " $BLUE${!i}"; done
|
||||
for (( i=$depart ; i<=$# ; i++ )); do
|
||||
echo -e " $BLUE${!i}$STD"
|
||||
done
|
||||
unset i
|
||||
[ "$1" == raw ] && printf "$COLOR" || echo "$COLOR"
|
||||
[ "$1" == raw ] || echo
|
||||
}
|
||||
|
||||
# log spécifique, fichier log limité à 10000octets, $1 message à loguer
|
||||
f__log(){ # 08/O9/2017
|
||||
f__log(){ # 08/09/2017
|
||||
if [ -w "$fileLogs" ]; then
|
||||
if [ "$(stat -c %s $fileLogs)" -ge "10000" ]; then
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null > "$fileLogs"
|
||||
|
|
@ -88,16 +101,40 @@ f__requis(){ # 22/09/2017
|
|||
fi
|
||||
}
|
||||
|
||||
# $1=cmd si $2: nb de tentatives pour s'identifier, sinon 1 tentative par défaut
|
||||
f__sudo(){ # 08/10/2017
|
||||
local nb=1 sudo isudo
|
||||
# sudo --shell bash équivalent su ?
|
||||
if sudo -v &>/dev/null && [ $EUID -ne 0 ] ; then
|
||||
sudo="sudo --shell $(which bash) "
|
||||
else
|
||||
sudo="su --shell $(which bash) --preserve-environment -c "
|
||||
fi
|
||||
[ "$2" ] && nb="$2"
|
||||
for (( isudo=1 ; isudo<="$nb" ; isudo++ )); do
|
||||
$sudo " $1"
|
||||
[ "$?" == 0 ] && break
|
||||
[ "$isudo" == "$nb" ] && return 1
|
||||
done
|
||||
}
|
||||
|
||||
# user ayant initié la session graphique, assigne $user_
|
||||
# return 1 sur échec identification user, return 2 sur absence home/
|
||||
# gestion variable environnement user avec: USER_INSTALL=user script
|
||||
f__user(){ # 30/08/2017-4
|
||||
f__user(){ # 06/10/2017
|
||||
local user_id test root_login
|
||||
root_login="$(grep ':0:' /etc/passwd | cut -d':' -f1)" || root_login="root"
|
||||
if [ "$USER_INSTALL" ]; then # user_ via variable environnement, moyen d'injecter root
|
||||
user_="$USER_INSTALL";
|
||||
return 0
|
||||
elif [[ "$TERM" =~ linux ]]; then #debian 9 recovery ou nomodeset TERM=linux
|
||||
if [ "$USER" ]; then
|
||||
user_="$USER"
|
||||
elif [ "$EUID" -eq 0 ]; then
|
||||
user_="$root_login"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
local user_id test root_login
|
||||
root_login="$(grep ':0:' /etc/passwd | cut -d':' -f1)" || root_login="root"
|
||||
if [ "$SUDO_UID" ]; then
|
||||
user_id="$SUDO_UID";
|
||||
elif grep -qEo '[0-9]+' <<< "$XDG_RUNTIME_DIR" ; then
|
||||
|
|
@ -112,9 +149,9 @@ f__user(){ # 30/08/2017-4
|
|||
if [ "$SUDO_USER" ] && [ "$SUDO_USER" != "$root_login" ]; then
|
||||
user_="$SUDO_USER";
|
||||
elif grep -qv 'root' <<< "$(who)"; then
|
||||
user_="$(grep -v 'root' <<< $(who) | head -n1 | cut -d ' ' -f1)";
|
||||
user_="$(grep -v 'root' <<< $(who) | head -n1 | cut -d ' ' -f1)"; # grep -v 'root' <<< $(who) | awk 'FNR==1{print $1}'
|
||||
elif grep -q 'hourly.*get[A-Z].*\.anacrontab.*\.config/anacron/spool' /etc/crontab; then
|
||||
user_="$(grep 'hourly.*get[A-Z].*\.anacrontab.*\.config/anacron/spool' /etc/crontab | head -n1 | cut -d' ' -f2)";
|
||||
user_="$(grep 'hourly.*get[A-Z].*\.anacrontab.*\.config/anacron/spool' /etc/crontab | head -n1 | cut -d' ' -f2)"; # grep 'hourly.*get[A-Z].*\.anacrontab.*\.config/anacron/spool' /etc/crontab | awk 'FNR==1{print $2}
|
||||
fi
|
||||
fi
|
||||
if [ -z "$user_" ]; then return 1; fi
|
||||
|
|
@ -122,13 +159,17 @@ f__user(){ # 30/08/2017-4
|
|||
return 0
|
||||
}
|
||||
|
||||
# test wget, $1 url à tester, sortie script, sur erreur ou retour à la normale
|
||||
# test wget, $1 url à tester, sortie du script si $1 seul (même si url testée ok)
|
||||
# si $2=print affiche url testée & entêtes http & location (si présente) et sortie normale fonction
|
||||
# si $2=loc affiche seulement location
|
||||
f__wget_test(){ # 07/09/2017
|
||||
# si $2=loc affiche seulement location et sortie normale fonction
|
||||
# si $2=test return 0 si ok, return 1 si ko
|
||||
f__wget_test(){ # 08/10/2017
|
||||
local file_test_wget retourWget retourHttp location
|
||||
file_test_wget="/tmp/testWget-$RANDOM"
|
||||
wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget" || retourWget="$?"
|
||||
file_test_wget="/tmp/testWget-$$-$RANDOM"
|
||||
wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
|
||||
retourWget="$?"
|
||||
[ "$2" == "test" ] && rm "$file_test_wget"
|
||||
[ "$2" == "test" ] && [ "$retourWget" == "0" ] && return 0 || return 1
|
||||
[ "$retourWget" == 1 ] && retourWget="code erreur générique"
|
||||
[ "$retourWget" == 2 ] && retourWget="parse erreur (ligne de commande?)"
|
||||
[ "$retourWget" == 3 ] && retourWget="erreur Entrée/sortie fichier"
|
||||
|
|
@ -141,33 +182,30 @@ f__wget_test(){ # 07/09/2017
|
|||
location="$(grep -i 'location' $file_test_wget | xargs)"
|
||||
if [ "$2" == "print" ]; then
|
||||
if [ "$retourWget" ]; then
|
||||
echo "erreur wget: $RED$retourWget$COLOR"
|
||||
echo -e "$BLUE $1$COLOR\t$RED $retourHttp$COLOR"
|
||||
[ "$location" ] && echo "$YELLOW $location" || echo "$YELLOW no location"
|
||||
echo "$COLOR"
|
||||
return
|
||||
echo "erreur wget: $RED$retourWget"
|
||||
echo -e "$BLUE $1$STD\t$RED $retourHttp"
|
||||
else
|
||||
echo -e "$BLUE $1$COLOR\t$GREEN $retourHttp$YELLOW"
|
||||
[ "$location" ] && echo "$YELLOW $location" || echo "$YELLOW no location"
|
||||
echo "$COLOR"
|
||||
return
|
||||
echo -e "$BLUE $1$STD\t$GREEN $retourHttp"
|
||||
fi
|
||||
fi
|
||||
if [ "$2" == "loc" ]; then
|
||||
[ "$location" ] && echo "$location" || echo "no location"
|
||||
return
|
||||
if [ "$2" == "print" ] || [ "$2" == "loc" ]; then
|
||||
[ "$location" ] && echo "$YELLOW $location" || echo "$YELLOW no location"
|
||||
echo "$STD"
|
||||
return 0
|
||||
fi
|
||||
if [ "$retourWget" ]; then
|
||||
rm "$file_test_wget"
|
||||
f__error "erreur wget, $retourWget" "$1" "$YELLOW$retourHttp" \
|
||||
"si persistance, contacter $projet $contact en indiquant les messages précédents"
|
||||
fi
|
||||
if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then echo -e "$GREEN\ntout est ok, réessayer\n$COLOR"; fi
|
||||
if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then
|
||||
echo -e "$GREEN\ntout est ok, réessayer\n$STD"
|
||||
fi
|
||||
rm "$file_test_wget"
|
||||
exit 0
|
||||
}
|
||||
|
||||
f_help(){ # 07/09/2017
|
||||
f_help(){ # 08/10/2017
|
||||
f__info "\n $GREEN$script $version$BLUE"
|
||||
cat << 'EOF'
|
||||
----------------------------------------------------------------------
|
||||
|
|
@ -188,23 +226,23 @@ cat << 'EOF'
|
|||
-u, --upgrade : upgrade script si maj possible
|
||||
-v, --version : version du script, en ligne et en cours d'exécution
|
||||
EOF
|
||||
echo -e "$COLOR plus d'infos: $GREEN$urlNotice$COLOR\n"
|
||||
echo -e "$STD plus d'infos: $GREEN$urlNotice\n"
|
||||
}
|
||||
|
||||
# assigne $ip_local, $gateway, $gateway_type, $gateway_one, $ip_local, $ip_local_type
|
||||
# $ifnames, $ifnames_type, $mac_address, mac_address_type
|
||||
figet_ip() { # 23/09/2017
|
||||
figet_ip(){ # 02/10/2017
|
||||
local ifn
|
||||
[ -z "$(which ip)" ] && return 1
|
||||
ip_local="$(sed '/lo.*inet/d; /inet6.*scope global/d' <<< "$(ip -o a)" | awk '{print " ",$4,"(",$2,")"}')"
|
||||
ip_local_type="$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.*)/\1 (ethernet)/' <<< $ip_local)"
|
||||
gateway="$(LC_ALL=C ip -4 route | awk '/default via/ {print " ",$3,"(",$5,")"}'; LC_ALL=C ip -6 route | awk '/default via/ {print " ",$3,"(",$5,")"}')"
|
||||
gateway_type="$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.*)/\1 (ethernet)/' <<< $gateway)"
|
||||
gateway_one="$(head -n 1 <<< $gateway | awk '{print " ",$1}')"
|
||||
gateway_one="$(awk 'FNR==1 {print " ",$1}' <<< $gateway)"
|
||||
for ifn in $(ls /sys/class/net/) ; do
|
||||
[ "$ifn" != "lo" ] && ifnames+=" $ifn"$'\n' # $'\n' -> newline ou $'\x0a' ou $'\012'
|
||||
[ "$ifn" != "lo" ] && mac_address+=" $ifn: $(cat /sys/class/net/$ifn/address)"$'\n'
|
||||
[ "$ifn" != "lo" ] && ifnames+=" $ifn"$'\n'
|
||||
[ "$ifn" != "lo" ] && mac_address+=" $ifn: $(< /sys/class/net/$ifn/address)"$'\n'
|
||||
done
|
||||
unset ifn
|
||||
ifnames="$(sed '/^$/d' <<< $ifnames)" # suppression \n final
|
||||
ifnames_type+="$(sed -E 's/(^.*wl.*)/\1 (wifi)/;s/(^.*en.*|^.*eth.*)/\1 (ethernet)/' <<< $ifnames)"
|
||||
mac_address="$(sed '/^$/d' <<< $mac_address)" # suppression \n final
|
||||
|
|
@ -212,8 +250,8 @@ figet_ip() { # 23/09/2017
|
|||
}
|
||||
|
||||
# $1=4|6, assigne $ip_public
|
||||
figet_ip_public(){ # 23/09/2017
|
||||
|
||||
figet_ip_public(){ # 02/10/2017
|
||||
local dig_test ip_test iip
|
||||
list_ip4(){
|
||||
ip_test+=" http://whatismyip.akamai.com"
|
||||
ip_test+=" http://ipof.in/txt"
|
||||
|
|
@ -251,7 +289,6 @@ figet_ip_public(){ # 23/09/2017
|
|||
}
|
||||
|
||||
unset ip_public
|
||||
local dig_test ip_test
|
||||
if [ "$1" == "4" ]; then
|
||||
ping -4 -c1 google.com &>/dev/null || ping -4 -c1 free.fr &>/dev/null || return 1 # test connectivité
|
||||
list_ip4_dig
|
||||
|
|
@ -265,29 +302,26 @@ figet_ip_public(){ # 23/09/2017
|
|||
fi
|
||||
|
||||
if [ "$(which dig)" ] && [ -z "$ip_public" ]; then
|
||||
for i in $dig_test ; do
|
||||
ip_public="$(dig +short $(sed 's;/; ;g' <<< $i))"
|
||||
for iip in $dig_test ; do
|
||||
ip_public="$(dig +short $(sed 's;/; ;g' <<< $iip))"
|
||||
[ "$ip_public" ] && break
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
|
||||
if [ "$(which wget)" ] && [ -z "$ip_public" ]; then
|
||||
cmd="wget --quiet --tries=1 --timeout=5 -O - "
|
||||
for i in $ip_test ; do
|
||||
ip_public="$($cmd $i)"
|
||||
for iip in $ip_test ; do
|
||||
ip_public="$($cmd $iip)"
|
||||
[ "$ip_public" ] && break
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
|
||||
if [ "$(which curl)" ] && [ -z "$ip_public" ]; then
|
||||
cmd="curl --silent --location --retry 0 --max-time 5" #--location pour aider redirections
|
||||
for i in $ip_test ; do
|
||||
ip_public="$($cmd $i)"
|
||||
for iip in $ip_test ; do
|
||||
ip_public="$($cmd $iip)"
|
||||
[ "$ip_public" ] && break
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
|
||||
if [ "$(which telnet)" ] && [ -z "$ip_public" ]; then
|
||||
|
|
@ -343,7 +377,7 @@ fscript_cronAnacron(){ # 06/09/2017
|
|||
}
|
||||
|
||||
# version script en ligne, assigne $versionScript, $script_aJour=ok|ko
|
||||
fscript_get_version(){ # 07/09/2017
|
||||
fscript_get_version(){ # 08/10/2017
|
||||
f__info "raw" "$GREEN""version script en cours: $version"
|
||||
versionScript="$(wget -q --tries=2 --timeout=15 -O - "$urlScript" | grep '^version=' | cut -d '=' -f 2)"
|
||||
if [ "$versionScript" ]; then
|
||||
|
|
@ -358,14 +392,15 @@ fscript_get_version(){ # 07/09/2017
|
|||
}
|
||||
|
||||
# installation du script dans le système
|
||||
fscript_install(){ # 06/09/2017
|
||||
fscript_install(){ # 08/10/2017
|
||||
if grep -q 'bin' <<< "$(dirname $0)" ; then
|
||||
f__info "$RED""l'installation dans le système doit se faire depuis un script local $GREEN(./$script -i )$COLOR"
|
||||
return
|
||||
f__info "$RED""l'installation dans le système doit se faire depuis un script local $GREEN(./$script -i )"
|
||||
return 1
|
||||
fi
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
f__info "$RED""vous devez être ROOT pour installer ce script dans le système$COLOR"
|
||||
return 3
|
||||
f__info "vous devez être$RED ROOT$BLUE pour installer ce script dans le système"
|
||||
f__sudo "exec $0 -i"
|
||||
return $?
|
||||
fi
|
||||
[ "$(type -t fscript_install_special)" ] && fscript_install_special # test, si fonction spécifique, appel
|
||||
f__requis "wget anacron cron"
|
||||
|
|
@ -373,31 +408,33 @@ fscript_install(){ # 06/09/2017
|
|||
mkdir -p /opt/bin/
|
||||
cp -d "$(basename $0)" "/opt/bin/$script"
|
||||
ln -s "/opt/bin/$script" "/usr/bin/$script" &>/dev/null
|
||||
chmod 755 "/opt/bin/$script"
|
||||
chmod 775 "/opt/bin/$script" # rwx rwx r-x, proprio user_
|
||||
# cron/anacron install
|
||||
fscript_cronAnacron "install"
|
||||
# création fichier log
|
||||
touch "$fileLogs"
|
||||
chmod 644 "$fileLogs"
|
||||
chmod 664 "$fileLogs" # rw- rw- r--, proprio user_
|
||||
chown "$user_:" "$fileLogs" "/opt/bin/$script"
|
||||
[ -e "$fileDev" ] || rm "$(basename $0)" &>/dev/null ## on efface pas si fileDev (dev)
|
||||
f__info "log" "$script $version installé dans le système." "maintenant, appel du script par:$GREEN $script$BLUE (sans ./)"
|
||||
f__info "log" "$script $version installé dans le système." "maintenant, appel du script par: $GREEN$script$BLUE (sans ./)"
|
||||
}
|
||||
|
||||
# suppression du script dans le système
|
||||
fscript_remove(){ # 06/09/2017
|
||||
fscript_remove(){ # 08/10/2017
|
||||
if ! grep -q 'bin' <<< "$(dirname $0)" ; then
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -r)$COLOR"
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -r)"
|
||||
return 1
|
||||
fi
|
||||
if [ ! -x "/opt/bin/$script" ];then
|
||||
f__info "$RED$script n'est pas installé$COLOR"
|
||||
return 2
|
||||
f__info "$RED$script n'est pas installé"
|
||||
return 1
|
||||
fi
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
f__info "$RED""vous devez être ROOT pour supprimer ce script dans le système$COLOR"
|
||||
return 3
|
||||
f__info "vous devez être$RED ROOT$BLUE pour supprimer ce script dans le système"
|
||||
f__sudo "exec $0 -r"
|
||||
return $?
|
||||
fi
|
||||
[ "$(type -t fscript_remove_special)" ] && fscript_remove_special # test, si fonction spécifique, appel
|
||||
# suppression de /opt
|
||||
rm "/opt/bin/$script" &>/dev/null
|
||||
unlink "/usr/bin/$script" &>/dev/null
|
||||
|
|
@ -407,11 +444,12 @@ fscript_remove(){ # 06/09/2017
|
|||
}
|
||||
|
||||
# mise à jour script si dispo
|
||||
fscript_update(){ # 06/09/2017
|
||||
fscript_update(){ # 08/10/2017
|
||||
if ! grep -q 'bin' <<< "$(dirname $0)" ; then
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -u)$COLOR"
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -u)"
|
||||
return
|
||||
fi
|
||||
[ "$(type -t fscript_update_special)" ] && fscript_update_special # test, si fonction spécifique, appel
|
||||
fscript_get_version
|
||||
if [ "$script_aJour" == "ok" ]; then
|
||||
f__info "log" "pas de mise à jour disponible pour $script $version"
|
||||
|
|
@ -421,7 +459,7 @@ fscript_update(){ # 06/09/2017
|
|||
mkdir -p "$dirTemp"
|
||||
wget -q --tries=2 --timeout=15 -O "$dirTemp/$script" "$urlScript"
|
||||
if [ "$?" != "0" ]; then f__wget_test "$urlScript"; fi
|
||||
chmod 755 "$dirTemp/$script"
|
||||
chmod 775 "/opt/bin/$script" # rwx rwx r-x, proprio user_
|
||||
chown "$user_:" "$dirTemp/$script"
|
||||
cp -d "$dirTemp/$script" "/opt/bin/$script"
|
||||
rm -rf "$dirTemp/"
|
||||
|
|
@ -429,18 +467,27 @@ fscript_update(){ # 06/09/2017
|
|||
f__info "log" "$script mis à jour en version $versionScript"
|
||||
}
|
||||
|
||||
testuser(){ # 08/2017
|
||||
f__user && retourFUser=0 || retourFUser="$?"
|
||||
[ "$retourFUser" -eq 1 ] && f__error "user indéterminé, pour contourner, lancer le script avec:\n USER_INSTALL=user $0 \n"
|
||||
[ "$retourFUser" -eq 2 ] && f__error "user détecté, mais pas de home: /home/$user_"
|
||||
testuser(){ # 06/10/2017
|
||||
f__user
|
||||
retourFUser="$?"
|
||||
[ "$retourFUser" -eq 1 ] && f__error "user indéterminé" \
|
||||
"pour contourner, lancer le script avec:\n$GREEN USER_INSTALL=<user> $0 \n"
|
||||
if [ "$retourFUser" -eq 2 ]; then
|
||||
[ "$EUID" -eq 0 ] && user_="root" || f__error "user détecté, mais pas de home: /home/$user_"
|
||||
f__info "user root"
|
||||
fi
|
||||
}
|
||||
|
||||
# initialisation
|
||||
PATH='/usr/sbin:/usr/bin:/sbin:/bin'; TERM=xterm; IFS=$' \t\n'
|
||||
export PATH TERM IFS
|
||||
|
||||
f__affichage
|
||||
|
||||
fileLogs="/var/log/sdeb_$script.log"
|
||||
fileDev="/opt/bin/fileDev"
|
||||
|
||||
[ "$(grep -o 'version 4' <<< $(bash --version) | sed 's/version //')" -ge "4" ] || f__error "bash version 4"
|
||||
f__requis "gawk wget ip>iproute2" # requis pour fonctionnement programme
|
||||
|
||||
options="$@"
|
||||
|
|
@ -462,9 +509,9 @@ for j in "$options"; do
|
|||
;; # affiche ip v6 public
|
||||
'' | --local )
|
||||
figet_ip || f__error "iproute2 doit être installé" "il remplace net-tools qui n'est plus développé"
|
||||
echo -e "\n ip locale(s):\n$BLUE$ip_local_type\n$COLOR"
|
||||
echo -e " passerelle(s):\n$BLUE$gateway_type\n$COLOR"
|
||||
echo -e " mac_address:\n$BLUE$mac_address_type\n$COLOR"
|
||||
echo -e "\n ip locale(s):\n$BLUE$ip_local_type\n$STD"
|
||||
echo -e " passerelle(s):\n$BLUE$gateway_type\n$STD"
|
||||
echo -e " mac_address:\n$BLUE$mac_address_type\n$STD"
|
||||
;; # affiche ip locales
|
||||
-i | --install )
|
||||
testuser
|
||||
|
|
@ -490,5 +537,7 @@ done
|
|||
unset j
|
||||
exit 0
|
||||
|
||||
wget -O getIp https://framagit.org/kyodev/kyopages/raw/master/scripts/getIp
|
||||
wget -O getIp https://frama.link/getip
|
||||
chmod +x getIp && ./getIp
|
||||
|
||||
wget -O getIp https://framagit.org/kyodev/kyopages/raw/master/scripts/getIp
|
||||
|
|
|
|||
|
|
@ -4,7 +4,20 @@
|
|||
## todo
|
||||
|
||||
* placé ln dans /usr/local/bin au lieu de /usr/bin ?
|
||||
* IP si ethernet non connecté, détecter et ne pas afficher cat /sys/class/net/enp3s0/carrier 0|1
|
||||
* adresses Mac
|
||||
---
|
||||
|
||||
## 1.11.0 08/10/2017
|
||||
|
||||
* f__wget_test(): nouvelle option test, nouveau nommage fichier temp
|
||||
* f__user, premier essai root only, fonctionnement en root only en console
|
||||
* révision figet_ip figet_ip_public
|
||||
* test bash4 au démarrage
|
||||
* révision f__color: utilisation terminfo pour retour au std (et non noir), donc modifs:
|
||||
* f__color f__error f__info f__wget_test f__dialog_oui_non
|
||||
* fscript_get_version fscript_install fscript_remove fscript_update
|
||||
* intégration f__sudo dans install & remove script
|
||||
|
||||
## 1.10.0 23/09/2017
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue