mirror of https://framagit.org/kyodev/kyopages.git
getFirefox 4.17.0
This commit is contained in:
kyodev
parent
61b8aa133d
commit
9ee8156fdd
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=4.16.1
|
||||
date="11/02/2018"
|
||||
version=4.17.0
|
||||
date="04/03/2018"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getFirefox"
|
||||
|
|
@ -46,19 +46,28 @@ f__archive_test(){ # 19/12/2017
|
|||
[[ -z "$archive_detect" || "$archive_detect" == "empty" ]] && return 1 || return 0 # laisser return 0 final sinon erreur, toujours return 1?!!
|
||||
}
|
||||
|
||||
f__color(){ # 31/01/2018
|
||||
f__color(){ # 01/03/2018
|
||||
|
||||
BLACK=$(tput setaf 0)
|
||||
RED=$(tput setaf 1) # alerte
|
||||
GREEN=$(tput setaf 2) # ok
|
||||
YELLOW=$(tput setaf 3) # question
|
||||
BLUE=$(tput setaf 4) # info
|
||||
CYAN=$(tput setaf 6)
|
||||
MAGENTA=$(tput setaf 5)
|
||||
STD=$(tput sgr0) # retour "normal"
|
||||
BOLD=$(tput bold)
|
||||
ITAL=$(tput sitm)
|
||||
SOUL=$(tput smul)
|
||||
if type -p tput &>/dev/null && tput setaf 1 &>/dev/null; then
|
||||
BLACK=$( tput setaf 0 )
|
||||
RED=$( tput setaf 1 ) # alerte
|
||||
GREEN=$( tput setaf 2 ) # ok
|
||||
YELLOW=$( tput setaf 3 ) # question
|
||||
BLUE=$( tput setaf 4 ) # info
|
||||
CYAN=$( tput setaf 6 )
|
||||
MAGENTA=$( tput setaf 5 )
|
||||
STD=$( tput sgr0 ) # retour "normal"
|
||||
BOLD=$( tput bold )
|
||||
ITAL=$( tput sitm )
|
||||
SOUL=$( tput smul )
|
||||
else
|
||||
YELLOW=$( echo -n "\033[0;33m" ) # ?
|
||||
GREEN=$( echo -n "\033[0;32m" ) # ok
|
||||
BLUE=$( echo -n "\033[0;34m" ) # info
|
||||
RED=$( echo -n "\033[0;31m" ) # alerte
|
||||
COLOR=$( echo -n "\033[0m" ) # standard
|
||||
STD=$( echo -n "\033[0m" ) # standard
|
||||
fi
|
||||
}
|
||||
|
||||
# affichage $1 en rouge, $1++ optionnels en bleu, sortie script sur erreur, log $1 si $operation=upgrade
|
||||
|
|
@ -75,11 +84,11 @@ f__error(){ # 18/12/2017
|
|||
}
|
||||
|
||||
# affichage en bleu, si $1=raw pas de ligne vide à la fin, si $1=log alors uniquement $2 logué, combiné: $1="log:raw"
|
||||
f__info(){ # 26/12/2017
|
||||
f__info(){ # 22/02/2018
|
||||
local depart=1 i
|
||||
|
||||
[[ "$1" =~ "raw" || "$1" =~ "log" ]] && depart=2
|
||||
[[ "$1" =~ "log" ]] && f__log "$(sed -E 's/\\t//;s/\\n// ' <<< $2 | xargs )"
|
||||
[[ "$1" =~ "log" ]] && f__log "$( sed -E 's/\\t//;s/\\n// ' <<< "$2" | xargs )"
|
||||
for (( i=$depart ; i<=$# ; i++ )); do
|
||||
echo -e " $BLUE${!i}$STD"
|
||||
done
|
||||
|
|
@ -144,10 +153,12 @@ f__requis(){ # 26/01/2018
|
|||
[ "$commandsMissing" ] && return 1 || return 0
|
||||
}
|
||||
|
||||
# $@=cmd à lancer en root avec su ou sudo. si $@ contient :x: x=nombre de tentatives, sinon 2 tentatives par défaut
|
||||
# $@=cmd à lancer en root avec su ou sudo. si $@ contient [':x:'] x=nombre de tentatives, 3 par défaut
|
||||
# si sudo si possible sera utilisé.
|
||||
# si su &2 redirigé sur &1
|
||||
# si bash inexistant, return 2
|
||||
f__sudo(){ # 26/01/2018
|
||||
local nb sudo isudo toBash options nbDefault=2
|
||||
f__sudo(){ # 24/02/2018
|
||||
local nb sudo isudo toBash options nbDefault=3
|
||||
|
||||
# détermination sudo possible
|
||||
type -p bash &>/dev/null && toBash=$( type -p bash ) || return 2
|
||||
|
|
@ -169,17 +180,22 @@ f__sudo(){ # 26/01/2018
|
|||
options="$@"
|
||||
fi
|
||||
# lancement cmds
|
||||
for (( isudo=1 ; isudo<="$nb" ; isudo++ )); do
|
||||
$sudo " $options"
|
||||
[ "$?" == 0 ] && break
|
||||
[ "$isudo" == "$nb" ] && return 1
|
||||
done
|
||||
if [[ "$sudo" =~ ^sudo ]]; then
|
||||
$sudo "$options"
|
||||
else
|
||||
for (( isudo=1 ; isudo<="$nb" ; isudo++ )); do
|
||||
echo -n "[su] Root, "
|
||||
$sudo "$options" 2>&1 # redirection demande pass (et erreur) sur &1 (utile quand &2 est redirigé en amont)
|
||||
[ "$?" == 0 ] && break
|
||||
[ "$isudo" == "$nb" ] && return 1
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
# user ayant initié la session graphique, assigne $fu_user
|
||||
# return 1 sur échec identification user, return 2 sur absence home/
|
||||
# gestion variable environnement user avec: USER_INSTALL=<user> script
|
||||
f__user(){ # 3/12/2017
|
||||
f__user(){ # 24/02/2018
|
||||
local user userid test root_login
|
||||
|
||||
root_login="$(grep ':0:' /etc/passwd | cut -d':' -f1)" || root_login="root"
|
||||
|
|
@ -197,21 +213,21 @@ f__user(){ # 3/12/2017
|
|||
if [ "$SUDO_UID" ]; then
|
||||
userid="$SUDO_UID";
|
||||
elif grep -qEo '[0-9]+' <<< "$XDG_RUNTIME_DIR" ; then
|
||||
userid="$(grep -Eo '[0-9]+' <<< $XDG_RUNTIME_DIR | cut -d'/' -f4)"
|
||||
userid=$( grep -Eo '[0-9]+' <<< "$XDG_RUNTIME_DIR" | cut -d'/' -f4 )
|
||||
elif grep -qEo '[0-9]+' <<< "$XAUTHORITY" ; then
|
||||
userid="$(grep -Eo '[0-9]+' <<< $XAUTHORITY | cut -d'/' -f4)"
|
||||
userid=$( grep -Eo '[0-9]+' <<< "$XAUTHORITY" | cut -d'/' -f4 )
|
||||
fi
|
||||
[ "$userid" ] && user="$(grep $userid /etc/passwd | cut -d ":" -f 1 )"
|
||||
[ "$userid" ] && user=$( grep $userid /etc/passwd | cut -d ":" -f 1 )
|
||||
if [ "$user" ] && [ "$user" != "$root_login" ]; then
|
||||
fu_user="$user"
|
||||
return 0
|
||||
else
|
||||
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)"; # grep -v 'root' <<< $(who) | gawk 'FNR==1{print $1}'
|
||||
elif who | grep -qv 'root'; then
|
||||
user=$( who | grep -v 'root' | head -n1 | cut -d ' ' -f1 ); # who | grep -v 'root' | 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)"; # grep 'hourly.*get[A-Z].*\.anacrontab.*\.config/anacron/spool' /etc/crontab | gawk 'FNR==1{print $2}
|
||||
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
|
||||
fu_user="$user"
|
||||
|
|
@ -225,7 +241,7 @@ f__user(){ # 3/12/2017
|
|||
# si $2=print affiche url testée & entêtes http & location, return 0
|
||||
# si $2=loc affiche seulement location, return 0
|
||||
# si $2=test return 0 si ok, return 1 si KO
|
||||
f__wget_test(){ # 16/01/2018
|
||||
f__wget_test(){ # 22/02/2018
|
||||
local file_test_wget="/tmp/testWget-$script" retourWget retourHttp location
|
||||
|
||||
wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
|
||||
|
|
@ -243,7 +259,7 @@ f__wget_test(){ # 16/01/2018
|
|||
if [ "$2" == "test" ]; then
|
||||
rm -f "$file_test_wget"
|
||||
# spécial maintenance frama.link, pas de redirection sur page status framalink
|
||||
grep -q '303' <<< $retourHttp && return 1 # 303 See Other
|
||||
grep -q '303' <<< "$retourHttp" && return 1 # 303 See Other
|
||||
[ "$retourWget" == "0" ] && return 0 || return 1
|
||||
fi
|
||||
if [ "$2" == "print" ]; then
|
||||
|
|
@ -266,7 +282,7 @@ f__wget_test(){ # 16/01/2018
|
|||
echo -e "$RED erreur wget, $retourWget \n $1 \n $YELLOW$retourHttp \n $location$STD" # pour les diags
|
||||
return 1
|
||||
fi
|
||||
if grep -q '200' <<< $retourHttp; then
|
||||
if grep -q '200' <<< "$retourHttp"; then
|
||||
echo -e "$GREEN\ntout est ok, réessayer$STD\n"
|
||||
fi
|
||||
rm -f "$file_test_wget"
|
||||
|
|
@ -441,7 +457,7 @@ ffx_get_canalBas(){ # 18/12/2017
|
|||
}
|
||||
|
||||
# version en ligne et installée, affichage
|
||||
ffx_get_version(){ # 24/01/2018
|
||||
ffx_get_version(){ # 04/03/2018
|
||||
local recup_url ver_latest ver_esr ver_beta ver_nightly ii
|
||||
local verFfxInstall='' verFfxOnline='' pointeur fileTmp="/tmp/$script-getVersion_ffx"
|
||||
|
||||
|
|
@ -491,8 +507,8 @@ ffx_get_version(){ # 24/01/2018
|
|||
fi
|
||||
done
|
||||
|
||||
[[ $( xargs <<< $verFfxInstall ) ]] || verFfxInstall="Non installé"
|
||||
[[ $( xargs <<< $verFfxOnline ) ]] || verFfxOnline="$RED""n/a"
|
||||
[[ $( xargs <<< "$verFfxInstall" ) ]] || verFfxInstall="Non installé"
|
||||
[[ $( xargs <<< "$verFfxOnline" ) ]] || verFfxOnline="$RED""n/a"
|
||||
|
||||
echo -e "\n"
|
||||
f__info "raw" "$appli en place: $GREEN$verFfxInstall"
|
||||
|
|
@ -522,12 +538,12 @@ EOF
|
|||
}
|
||||
|
||||
# installation, $1 canal [$2='manuel', $3 archive]
|
||||
ffx_install(){ # 25/01/2017
|
||||
ffx_install(){ # 04/03/2018
|
||||
local fileTemp canal="$1" verArchive dirTemp="/tmp/$script-install_ffx"
|
||||
|
||||
fileTemp="$dirTemp/flash_player_npapi-linux$(getconf LONG_BIT).tar.gz"
|
||||
if [ "$2" == "manuel" ]; then
|
||||
verArchive=$( sed -E 's/.*firefox-(.*)\.linux.*$/\1/' <<< $(basename $3) )
|
||||
verArchive=$( sed -E 's/.*firefox-(.*)\.linux.*$/\1/' <<< "$( basename $3 )" )
|
||||
f__info "installation manuelle dans $canal de $appli version $verArchive ($( basename $3 ))"
|
||||
fileTemp="$3"
|
||||
mkdir -p "$dirTemp"
|
||||
|
|
@ -637,7 +653,7 @@ ffx_lanceur_desktop(){ # 16/01/2018
|
|||
}
|
||||
|
||||
# version personnalisation en ligne, [$1=quiet], assigne $perso_ffx_afaire
|
||||
ffx_pers_get_version(){ # 24/01/2018
|
||||
ffx_pers_get_version(){ # 04/03/2018
|
||||
local ii verEnPlace persEnPlace verPersOnline
|
||||
|
||||
x_ffx_pers_get_version=1
|
||||
|
|
@ -657,8 +673,8 @@ ffx_pers_get_version(){ # 24/01/2018
|
|||
done
|
||||
[ "$1" == "quiet" ] && return 0
|
||||
|
||||
[[ $( xargs <<< $persEnPlace ) ]] || persEnPlace="Non installé"
|
||||
[[ $( xargs <<< $verPersOnline ) ]] || verPersOnline="$RED""n/a"
|
||||
[[ $( xargs <<< "$persEnPlace" ) ]] || persEnPlace="Non installé"
|
||||
[[ $( xargs <<< "$verPersOnline" ) ]] || verPersOnline="$RED""n/a"
|
||||
|
||||
f__info "raw" "perso. $appli en place: $GREEN$persEnPlace"
|
||||
f__info "perso. $appli en ligne: $YELLOW$verPersOnline"
|
||||
|
|
@ -816,13 +832,12 @@ fscript_get_version(){ # 24/01/2018
|
|||
}
|
||||
|
||||
# installation du script dans le système
|
||||
fscript_install(){ # 26/01/2018
|
||||
fscript_install(){ # 24/02/2018
|
||||
|
||||
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 )"
|
||||
if grep -Eq "$script_install|/usr/bin/$script" <<< "$0"; then
|
||||
f__info "$RED""l'installation dans le système doit se faire depuis le script non installé $GREEN(./$script -i )"
|
||||
return 1
|
||||
fi
|
||||
|
||||
type -t fscript_install_special &>/dev/null && fscript_install_special # test, si fonction spécifique, appel
|
||||
f__requis "wget anacron cron" || exit 1
|
||||
# install /opt
|
||||
|
|
@ -842,9 +857,9 @@ fscript_install(){ # 26/01/2018
|
|||
}
|
||||
|
||||
# suppression du script dans le système
|
||||
fscript_remove(){ # 26/01/2018
|
||||
fscript_remove(){ # 24/02/2018
|
||||
|
||||
if ! grep -q 'bin' <<< "$( dirname $0 )" ; then
|
||||
if ! grep -Eq "$script_install|/usr/bin/$script" <<< "$0"; then
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -r)"
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -854,7 +869,7 @@ fscript_remove(){ # 26/01/2018
|
|||
fi
|
||||
|
||||
type -t fscript_remove_special &>/dev/null && fscript_remove_special # test, si fonction spécifique, appel
|
||||
# suppression de /opt lien /usr/bin
|
||||
# suppression /opt, lien /usr/bin
|
||||
rm -f "$script_install"
|
||||
unlink "/usr/bin/$script" &>/dev/null
|
||||
# cron/anacron remove
|
||||
|
|
@ -864,11 +879,11 @@ fscript_remove(){ # 26/01/2018
|
|||
}
|
||||
|
||||
# mise à jour script, [$1 != "" si upgrade en place, $1 dans message info]
|
||||
fscript_update(){ # 26/01/2018
|
||||
fscript_update(){ # 01/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
|
||||
if [ -z "$upgradeEnPlace" ] && ! grep -q 'bin' <<< "$( dirname $0 )" ; then
|
||||
if [ -z "$upgradeEnPlace" ] && ! grep -Eq "$script_install|/usr/bin/$script" <<< "$0"; then
|
||||
f__info "$RED""cette fonction doit être appelée depuis le script installé dans le système $GREEN($script -u)"
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -897,7 +912,7 @@ fscript_update(){ # 26/01/2018
|
|||
rm -rf "$dirTemp/"
|
||||
}
|
||||
|
||||
prg_init(){ # 29/01/2018
|
||||
prg_init(){ # 04/03/2018
|
||||
|
||||
PATH='/usr/sbin:/usr/bin:/sbin:/bin'
|
||||
TERM=xterm
|
||||
|
|
@ -905,6 +920,10 @@ prg_init(){ # 29/01/2018
|
|||
IFS=$' \t\n'
|
||||
export PATH TERM IFS
|
||||
|
||||
# options bash figées
|
||||
shopt -s checkwinsize complete_fullquote extglob extquote interactive_comments sourcepath
|
||||
shopt -u force_fignore execfail failglob
|
||||
|
||||
# test bash v4
|
||||
[ "$BASH_VERSINFO" == 4 ] || f__error "bash v4 requis" "version installée: $BASH_VERSION"
|
||||
|
||||
|
|
@ -936,7 +955,7 @@ prg_init(){ # 29/01/2018
|
|||
######## début script / initialisation
|
||||
|
||||
# tests ou initialisation au démarrage
|
||||
prg_init # 1ère fonction à appeler
|
||||
prg_init
|
||||
|
||||
# logo et définition couleurs
|
||||
f_affichage
|
||||
|
|
|
|||
|
|
@ -6,6 +6,13 @@ todo
|
|||
* révision extraction n° version
|
||||
|
||||
|
||||
## getFirefox 4.17.0 04/03/2018
|
||||
|
||||
* synchro fscript_install, fscript_remove, fscript_update
|
||||
* synchro: f__color, f__info, f__sudo, f__user, f__wget_test
|
||||
* révision: prg_init
|
||||
* révision: général vieux ubuntu 16.04, ffx_get_version, ffx_install, ffx_pers_get_version
|
||||
|
||||
## getFirefox 4.16.1 11/02/2018
|
||||
|
||||
* syncro: f__color
|
||||
|
|
@ -147,7 +154,7 @@ fix: ffx_remove, oubli suppression lien dans /usr/bin
|
|||
* f__user, premier essai root only, fonctionnement en root only en console
|
||||
* 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
|
||||
* f__color f__error f__info f__wget_test
|
||||
* fscript_get_version fscript_install fscript_remove fscript_update
|
||||
* intégration f__sudo dans install & remove script
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue