mirror of https://framagit.org/kyodev/kyopages.git
getIp 2.12.0
This commit is contained in:
parent
d723619fb0
commit
970c9ae2f9
|
@ -111,10 +111,10 @@ f__log(){ # 05/03/2018
|
|||
|
||||
# recherche commandes/paquets, $1 liste: cmd1|cmd2[>paquet] (séparées par espaces) ex: "gawk|mawk>gawk wget"
|
||||
# si manque, return 1 & affiche commandes manquantes (si debian, ajout proposition paquet à installer)
|
||||
f__requis(){ # 05/03/2018
|
||||
f__requis(){ # 09/03/2018
|
||||
local ENV_DEBIAN ireq table package commands command commandsMissing packagesMissing
|
||||
|
||||
if type -p "dpkg" &>/dev/null ; then
|
||||
if type -p dpkg &>/dev/null ; then
|
||||
ENV_DEBIAN="oui" # debian
|
||||
fi
|
||||
if type -t f__info &>/dev/null; then
|
||||
|
@ -757,7 +757,9 @@ fscript_remove(){ # 24/02/2018
|
|||
}
|
||||
|
||||
# si upgrade en place, $1 != "", [$1 message info]
|
||||
fscript_update(){ # 07/03/2018
|
||||
# shellcheck disable=SC2120
|
||||
# function references arguments, but none are ever passed.
|
||||
fscript_update(){ # 09/03/2018
|
||||
local dirTemp="/tmp/$script-maj" upgradeEnPlace="$1"
|
||||
|
||||
type -t fscript_update_special &>/dev/null && fscript_update_special # test, si fonction spécifique, appel
|
||||
|
@ -774,7 +776,7 @@ fscript_update(){ # 07/03/2018
|
|||
fi
|
||||
mkdir -p "$dirTemp"
|
||||
if ! wget -q --tries=2 --timeout=15 -o /dev/null -O "$dirTemp/$script" "$url_script"; then
|
||||
rm -fr "${dirTemp:?}"
|
||||
rm -fr "$dirTemp"
|
||||
f__wget_test "$url_script"
|
||||
fi
|
||||
if grep -q '#!/bin/bash' "$dirTemp/$script" && grep -q '^### END CONTROL' "$dirTemp/$script"; then
|
||||
|
@ -786,7 +788,7 @@ fscript_update(){ # 07/03/2018
|
|||
else
|
||||
f_info "log" "$script: échec update" "mauvais téléchargement, réessayer plus tard"
|
||||
fi
|
||||
rm -fr "${dirTemp:?}"
|
||||
rm -fr "$dirTemp"
|
||||
}
|
||||
|
||||
test_user(){ # 09/03/2018
|
||||
|
@ -850,7 +852,8 @@ for j in $options; do
|
|||
case $j in
|
||||
!(--public|-4|-6|-46|-64) )
|
||||
f_affichage
|
||||
echo ;;&
|
||||
echo
|
||||
;;&
|
||||
-i | --install | -r | --remove )
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
f__info "vous devez être$RED ROOT$BLUE pour cette opération"
|
||||
|
|
Loading…
Reference in New Issue