mirror of https://framagit.org/kyodev/kyopages.git
getFirefox 4.19.0
This commit is contained in:
kyodev
parent
8a635d1bf6
commit
ef83397ebe
|
|
@ -1,9 +1,10 @@
|
|||
#!/bin/bash
|
||||
# shellcheck disable=SC2119
|
||||
# SC2119 Use function "$@" if function's $1 should mean script's $1 (??)
|
||||
|
||||
version=4.17.1
|
||||
date="04/03/2018"
|
||||
projet="simpledeb"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
version=4.19.0
|
||||
date="09/03/2018"
|
||||
#contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues/"
|
||||
script="getFirefox"
|
||||
|
||||
##### license LPRAB/WTFPL
|
||||
|
|
@ -16,7 +17,6 @@ script="getFirefox"
|
|||
# remarque, debian: dpkg --print-architecture affiche i386
|
||||
f__architecture(){ # 14/12/2017 SPÉCIFIQUE
|
||||
|
||||
x_architecture=1
|
||||
case "$(uname -m)" in
|
||||
amd64 | x86_64 )
|
||||
fu_archi="linux64";;
|
||||
|
|
@ -35,17 +35,20 @@ f__architecture(){ # 14/12/2017 SPÉCIFIQUE
|
|||
}
|
||||
|
||||
# test validité archive, $1 archive, assigne $archive_detect (gzip|xz|deb|zip), return 1 si inconnue
|
||||
f__archive_test(){ # 19/12/2017
|
||||
local filetest=$( file -b $1 )
|
||||
f__archive_test(){ # O9/03/2018
|
||||
local filetest
|
||||
|
||||
filetest=$( file -b "$1" )
|
||||
grep -q 'gzip compressed data' <<< "$filetest" && archive_detect="gzip"
|
||||
grep -q 'bzip2 compressed data' <<< "$filetest" && archive_detect="bzip2"
|
||||
grep -q 'Debian binary package' <<< "$filetest" && archive_detect="deb"
|
||||
grep -q 'Zip archive data' <<< "$filetest" && archive_detect="zip"
|
||||
grep -q 'XZ compressed data' <<< "$filetest" && archive_detect="xz"
|
||||
[[ -z "$archive_detect" || "$archive_detect" == "empty" ]] && return 1 || return 0 # laisser return 0 final sinon erreur, toujours return 1?!!
|
||||
if [[ -z "$archive_detect" || "$archive_detect" == "empty" ]]; then return 1; fi
|
||||
}
|
||||
|
||||
# shellcheck disable=SC2034
|
||||
# SC2034 foo appears unused. Verify it or export it.
|
||||
f__color(){ # 01/03/2018
|
||||
|
||||
if type -p tput &>/dev/null && tput setaf 1 &>/dev/null; then
|
||||
|
|
@ -84,22 +87,26 @@ 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(){ # 22/02/2018
|
||||
f__info(){ # 05/03/2018
|
||||
local depart=1 i
|
||||
|
||||
[[ "$1" =~ "raw" || "$1" =~ "log" ]] && depart=2
|
||||
[[ "$1" =~ "log" ]] && f__log "$( sed -E 's/\\t//;s/\\n// ' <<< "$2" | xargs )"
|
||||
for (( i=$depart ; i<=$# ; i++ )); do
|
||||
if [[ "$1" =~ "raw" || "$1" =~ "log" ]]; then
|
||||
depart=2
|
||||
fi
|
||||
if [[ "$1" =~ "log" ]]; then
|
||||
f__log "$( sed -E 's/\\t//;s/\\n// ' <<< "$2" | xargs )"
|
||||
fi
|
||||
for (( i="$depart" ; i<=$# ; i++ )); do
|
||||
echo -e " $BLUE${!i}$STD"
|
||||
done
|
||||
[[ "$1" =~ raw ]] || echo
|
||||
}
|
||||
|
||||
# log spécifique, fichier log limité à 10000 octets, $1 message à loguer
|
||||
f__log(){ # 4/12/2017
|
||||
f__log(){ # 05/03/2018
|
||||
|
||||
if [ -w "$script_logs" ]; then
|
||||
if [ "$(stat -c %s $script_logs)" -ge "10000" ]; then
|
||||
if [ "$( stat -c %s "$script_logs" )" -ge "10000" ]; then
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null > "$script_logs"
|
||||
else
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null >> "$script_logs"
|
||||
|
|
@ -109,23 +116,28 @@ f__log(){ # 4/12/2017
|
|||
|
||||
# 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(){ # 26/01/2018
|
||||
f__requis(){ # 09/03/2018
|
||||
local ENV_DEBIAN ireq table package commands command commandsMissing packagesMissing
|
||||
|
||||
type -p "dpkg" &>/dev/null && ENV_DEBIAN="oui" # debian
|
||||
type -t f__info &>/dev/null && c_echo="f__info" || c_echo="echo -e" # f__info existe? sinon echo
|
||||
|
||||
if type -p dpkg &>/dev/null ; then
|
||||
ENV_DEBIAN="oui" # debian
|
||||
fi
|
||||
if type -t f__info &>/dev/null; then
|
||||
c_echo="f__info"
|
||||
else
|
||||
c_echo="echo -e" # f__info existe? sinon echo
|
||||
fi
|
||||
for ireq in $1; do # pour tous les composants de la liste $1
|
||||
table=( ${ireq//>/ } ) # séparation sur >, split avec double bashisme, mais évite manip $IFS
|
||||
table=( ${ireq//>/ } ) # split sur > évite manip $IFS
|
||||
|
||||
commands=( ${table[0]//|/ } ) # séparation sur |
|
||||
if [ ${table[1]} ]; then
|
||||
commands=( ${table[0]//|/ } ) # split sur |
|
||||
if [ "${table[1]}" ]; then
|
||||
package=${table[1]}
|
||||
else
|
||||
package="$commands" # pas de oackages dans les options, donc idem commands[0]
|
||||
package=${commands[0]} # pas de packages dans les options, donc idem commands[0]
|
||||
fi
|
||||
|
||||
for command in ${commands[@]}; do # pour toutes les commandes
|
||||
for command in "${commands[@]}"; do # pour toutes les commandes
|
||||
if type -p "$command" &>/dev/null ; then
|
||||
unset commandsMissing packagesMissing
|
||||
break
|
||||
|
|
@ -137,8 +149,8 @@ f__requis(){ # 26/01/2018
|
|||
done
|
||||
|
||||
# dédoublonnage & triage
|
||||
commandsMissing=$( echo $commandsMissing | tr ' ' '\n' | sort --unique | tr '\n' ' ' )
|
||||
packagesMissing=$( echo $packagesMissing | tr ' ' '\n' | sort --unique | tr '\n' ' ' )
|
||||
commandsMissing=$( echo "$commandsMissing" | tr ' ' '\n' | sort --unique | tr '\n' ' ' )
|
||||
packagesMissing=$( echo "$packagesMissing" | tr ' ' '\n' | sort --unique | tr '\n' ' ' )
|
||||
# suppression éventuel espace final
|
||||
commandsMissing=${commandsMissing% }
|
||||
packagesMissing=${packagesMissing% }
|
||||
|
|
@ -157,46 +169,44 @@ f__requis(){ # 26/01/2018
|
|||
# si sudo si possible sera utilisé.
|
||||
# si su &2 redirigé sur &1
|
||||
# si bash inexistant, return 2
|
||||
f__sudo(){ # 24/02/2018
|
||||
local nb sudo isudo toBash options nbDefault=3
|
||||
f__sudo(){ # 06/03/2018
|
||||
local nb sudo isudo options nbDefault=3
|
||||
|
||||
# détermination sudo possible
|
||||
type -p bash &>/dev/null && toBash=$( type -p bash ) || return 2
|
||||
# sudo --shell bash équivalent su ?
|
||||
if sudo -v &>/dev/null && [ $EUID -ne 0 ] ; then
|
||||
sudo="sudo su --shell $toBash --preserve-environment -c "
|
||||
sudo="sudo su --preserve-environment -c "
|
||||
else
|
||||
sudo="su --shell $toBash --preserve-environment -c "
|
||||
sudo="su --preserve-environment -c "
|
||||
fi
|
||||
# extraction nb de tentatives éventuel
|
||||
if [[ "$@" =~ :.{1,2}: ]]; then
|
||||
nb="$@"
|
||||
if [[ "$*" =~ :.{1,2}: ]]; then
|
||||
nb="$*"
|
||||
nb=${nb#*:}
|
||||
nb=${nb%:*}
|
||||
options=${@//:$nb:/ }
|
||||
(( ${nb}+1 )) 2>/dev/null || nb="$nbDefault" # test si numérique, sinon,
|
||||
options=${*//:$nb:/ }
|
||||
(( nb+1 )) 2>/dev/null || nb="$nbDefault" # test si numérique, sinon,
|
||||
else
|
||||
nb="$nbDefault"
|
||||
options="$@"
|
||||
options="$*"
|
||||
fi
|
||||
# lancement cmds
|
||||
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
|
||||
echo -en "\n[su] Mot de passe root : "
|
||||
$sudo "$options" 2>/dev/null && break
|
||||
[ "$isudo" == "$nb" ] && return 1
|
||||
done
|
||||
echo
|
||||
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(){ # 24/02/2018
|
||||
local user userid test root_login
|
||||
f__user(){ # 08/03/2018
|
||||
local user userid 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 si pb
|
||||
|
|
@ -214,10 +224,10 @@ f__user(){ # 24/02/2018
|
|||
userid="$SUDO_UID";
|
||||
elif grep -qEo '[0-9]+' <<< "$XDG_RUNTIME_DIR" ; then
|
||||
userid=$( grep -Eo '[0-9]+' <<< "$XDG_RUNTIME_DIR" | cut -d'/' -f4 )
|
||||
elif grep -qEo '[0-9]+' <<< "$XAUTHORITY" ; then
|
||||
else
|
||||
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
|
||||
|
|
@ -226,8 +236,8 @@ f__user(){ # 24/02/2018
|
|||
user="$SUDO_USER";
|
||||
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 | awk 'FNR==1{print $2}
|
||||
else
|
||||
user=$( grep -m1 'hourly.*get[A-Z].*\.anacrontab.*\.config/anacron/spool' /etc/crontab | cut -d' ' -f2 );
|
||||
fi
|
||||
fi
|
||||
fu_user="$user"
|
||||
|
|
@ -289,7 +299,7 @@ f__wget_test(){ # 22/02/2018
|
|||
exit 0
|
||||
}
|
||||
|
||||
f_affichage(){ # 24/01/2018
|
||||
f_affichage(){ # 09/03/2018
|
||||
local affichage_text=" _ _____ _ __
|
||||
__ _ ___| |_| ___(_)_ __ ___ / _| _____ __
|
||||
/ _' |/ _ \ __| |_ | | '__/ _ \ |_ / _ \ \/ /
|
||||
|
|
@ -297,12 +307,14 @@ f_affichage(){ # 24/01/2018
|
|||
\__, |\___|\__|_| |_|_| \___|_| \___/_/\_\
|
||||
|___/"
|
||||
|
||||
(( x_logo == 1 )) && return
|
||||
x_logo=1
|
||||
clear
|
||||
echo -e "$BLUE$affichage_text$YELLOW version $version - $date$STD\n"
|
||||
}
|
||||
|
||||
# affichage help
|
||||
f_help(){ # 04/03/2018
|
||||
f_help(){ # 09/03/2018
|
||||
local ligne help=(
|
||||
"----------------------------------------------------------------------"
|
||||
" canaux possibles:$GREEN latest, beta, nightly, dev, esr$STD"
|
||||
|
|
@ -312,10 +324,10 @@ f_help(){ # 04/03/2018
|
|||
"$BLUE$script i-$STD${GREEN}canal$STD : ${RED}i${STD}nstallation de $appli <canal> $RED(root)$STD"
|
||||
" avec option $GREEN--sauve$STD l'archive téléchargée est sauvegardée dans le répertoire courant"
|
||||
""
|
||||
"$BLUE$script d-$STD${GREEN}canal$STD : copier un profil ${RED}.d${STD}efault existant sur <canal>"
|
||||
"$BLUE$script d-$STD${GREEN}canal$STD : copier un éventuel profil ${RED}.d${STD}efault existant sur <canal>"
|
||||
"$BLUE$script m-$STD${GREEN}canal archi$STD : installation sur le <canal> d'une <archi>ve téléchargée ${RED}m${STD}anuellement $RED(root)$STD"
|
||||
"$BLUE$script r-$STD${GREEN}canal$STD : désinstallation (${RED}r${STD}emove) du <canal> $RED(root)$STD"
|
||||
"$BLUE$script ri$STD : ${RED}r${STD}éparation$RED i${STD}cône(s) dans le menu"
|
||||
"$BLUE$script ri$STD : ${RED}r${STD}éparation$RED i${STD}cône(s) et lanceur(s) dans le menu $RED(root)$STD"
|
||||
"$BLUE$script u-$STD${GREEN}canal$STD : profil pour l'${RED}u${STD}tilisateur en cours et comme défaut système $RED(root)$STD"
|
||||
""
|
||||
"$BLUE$script p-$STD${GREEN}canal$STD : ${RED}p${STD}ersonnalisation sur le <canal> de user.js & userChrome.css"
|
||||
|
|
@ -340,7 +352,7 @@ f_help(){ # 04/03/2018
|
|||
}
|
||||
|
||||
# traitement utilisateur(profiles.ini), $1=canal, [$2='menu'] si appel indépendant pour reconfiguration
|
||||
ffx_config_profil(){ # 14/01/2018
|
||||
ffx_config_profil(){ # 09/03/2018
|
||||
local nbProfiles canal="$1"
|
||||
|
||||
if [ ! -d "$dirInstallFfx$canal" ] && [ "$2" == "menu" ]; then # pas de répertoire programme
|
||||
|
|
@ -363,19 +375,21 @@ ffx_config_profil(){ # 14/01/2018
|
|||
# comptage profils existants
|
||||
nbProfiles=$( grep -cEs '\[Profile[0-9]+\]' "$dirProfilFfx/profiles.ini" )
|
||||
# création profil dans profile.ini
|
||||
echo >> "$dirProfilFfx/profiles.ini"
|
||||
echo "[Profile$nbProfiles]" >> "$dirProfilFfx/profiles.ini"
|
||||
echo "Name=$canal" >> "$dirProfilFfx/profiles.ini"
|
||||
echo "IsRelative=1" >> "$dirProfilFfx/profiles.ini"
|
||||
echo "Path=$canal" >> "$dirProfilFfx/profiles.ini"
|
||||
{
|
||||
echo
|
||||
echo "[Profile$nbProfiles]"
|
||||
echo "Name=$canal"
|
||||
echo "IsRelative=1"
|
||||
echo "Path=$canal"
|
||||
} >> "$dirProfilFfx/profiles.ini"
|
||||
fi
|
||||
|
||||
f__info "log:raw" "profil $appli $canal configuré"
|
||||
}
|
||||
|
||||
# traitement système: lien /usr/bin & alternatives, $1 canal
|
||||
ffx_config_system(){ # 01/02/2018
|
||||
local canal="$1" xbrowser ligne numero marqueur stockage profileIni="$dirProfilFfx/profiles.ini"
|
||||
ffx_config_system(){ # 09/03/2018
|
||||
local canal="$1" xbrowser ligne marqueur stockage profileIni="$dirProfilFfx/profiles.ini"
|
||||
|
||||
if [ ! -d "$dirInstallFfx$canal" ]; then
|
||||
f__info "$appli $canal n'est pas installé"
|
||||
|
|
@ -385,7 +399,7 @@ ffx_config_system(){ # 01/02/2018
|
|||
#lanceurs
|
||||
ln -sf "/usr/bin/firefox-$canal" "/usr/bin/firefox" # lien "lanceur" sur lanceur réel
|
||||
# update-alternatives
|
||||
if type -p "update-alternatives" &>/dev/null ; then # update-alternatives existe?
|
||||
if type -p update-alternatives &>/dev/null ; then # update-alternatives existe?
|
||||
if type -p x-www-browser &>/dev/null; then # commande x-www-browser existe ?
|
||||
xbrowser=$( type -p x-www-browser 2>/dev/null ) # déjà existant
|
||||
else
|
||||
|
|
@ -394,14 +408,13 @@ ffx_config_system(){ # 01/02/2018
|
|||
update-alternatives --quiet --install "$xbrowser" 'x-www-browser' "/usr/bin/firefox-$canal" 100 # nouvelle alternative
|
||||
update-alternatives --quiet --set 'x-www-browser' "/usr/bin/firefox-$canal" # si la priorité n'était pas suffisante
|
||||
if type -p gnome-www-browser &>/dev/null; then # commande gnome-www-browser existe ?
|
||||
update-alternatives --quiet --install $( type -p gnome-www-browser 2>/dev/null ) 'gnome-www-browser' "/usr/bin/firefox-$canal" 100 # nouvelle alternative
|
||||
update-alternatives --quiet --install "$( type -p gnome-www-browser 2>/dev/null )" 'gnome-www-browser' "/usr/bin/firefox-$canal" 100 # nouvelle alternative
|
||||
update-alternatives --quiet --set 'gnome-www-browser' "/usr/bin/firefox-$canal" # si la priorité n'était pas suffisante
|
||||
fi
|
||||
fi
|
||||
|
||||
# set default=1 dans profiles.ini
|
||||
while read -r ligne ; do
|
||||
[[ ${ligne} =~ ^\[Profile.*\]$ ]] && numero=${ligne//[\[Profile\]]} # n° profil, pas utilisé
|
||||
[[ $ligne == "Name=$canal" ]] && marqueur="ok" # détection canal recherché? marqueur actif
|
||||
[[ $ligne == "Default=1" ]] && continue # si Default existant, on saute, la ligne ne fera donc pas partie de $stockage (=effacement)
|
||||
|
||||
|
|
@ -457,7 +470,7 @@ ffx_get_canalBas(){ # 18/12/2017
|
|||
}
|
||||
|
||||
# version en ligne et installée, affichage
|
||||
ffx_get_version(){ # 04/03/2018
|
||||
ffx_get_version(){ # 09/03/2018
|
||||
local recup_url ver_latest ver_esr ver_beta ver_nightly ii
|
||||
local verFfxInstall='' verFfxOnline='' pointeur fileTmp="/tmp/$script-getVersion_ffx"
|
||||
|
||||
|
|
@ -465,22 +478,25 @@ ffx_get_version(){ # 04/03/2018
|
|||
#recup url
|
||||
# version latest & esr
|
||||
recup_url="https://www.mozilla.org/en-US/firefox/notes/"
|
||||
wget -q --tries=2 --timeout=15 --user-agent="$user_agent" -o /dev/null -O - "$recup_url" &>"$fileTmp"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$recup_url"
|
||||
if ! wget -q --tries=2 --timeout=15 --user-agent="$user_agent" -o /dev/null -O - "$recup_url" &>"$fileTmp" ; then
|
||||
f__wget_test "$recup_url"
|
||||
fi
|
||||
ver_latest=$( grep -Eos 'data-latest-firefox="[0-9\.]+"' $fileTmp | grep -Eo '[0-9\.]+' )
|
||||
echo -n "."
|
||||
ver_esr=$( grep -Eos 'data-esr-versions="[0-9\.]+"' $fileTmp | grep -Eo '[0-9\.]+' )
|
||||
echo -n "."
|
||||
# version beta
|
||||
recup_url="https://download.mozilla.org/?product=firefox-beta-latest&os=linux64&lang=fr"
|
||||
wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$recup_url" &>"$fileTmp"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$recup_url"
|
||||
if ! wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$recup_url" &>"$fileTmp" ; then
|
||||
f__wget_test "$recup_url"
|
||||
fi
|
||||
ver_beta=$( grep -is 'location' $fileTmp | sed -E 's/.*firefox-(.*)\.tar.bz2/\1/' )
|
||||
echo -n "."
|
||||
# version nightly
|
||||
recup_url="https://download.mozilla.org/?product=firefox-nightly-latest-l10n-ssl&os=linux64&lang=fr"
|
||||
wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$recup_url" &>"$fileTmp"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$recup_url"
|
||||
if ! wget -Sq --tries=1 --timeout=10 --user-agent="$user_agent" --spider --save-headers "$recup_url" &>"$fileTmp" ; then
|
||||
f__wget_test "$recup_url"
|
||||
fi
|
||||
ver_nightly=$( grep -is 'location' $fileTmp | sed -E 's/.*firefox-(.*)\.fr.linux.*/\1/' )
|
||||
echo -n "."
|
||||
rm -f "$fileTmp"
|
||||
|
|
@ -495,20 +511,20 @@ ffx_get_version(){ # 04/03/2018
|
|||
# versions en ligne
|
||||
[ "$ii" == "dev" ] && continue
|
||||
pointeur="ver_$ii"
|
||||
verFfxOnline+=$( printf "%7s: %-7s " $ii ${!pointeur} )
|
||||
verFfxOnline+=$( printf "%7s: %-7s " "$ii" "${!pointeur}" )
|
||||
[[ "${!pointeur}" != "${RED}n/a" ]] && (( compteur++ ))
|
||||
|
||||
# versions installées
|
||||
if [ -x "$dirInstallFfx$ii/firefox" ]; then
|
||||
verFfxInstall+=$( printf "%7s: %-7s " $ii $( $dirInstallFfx$ii/firefox -v | grep -Eo '[0-9].*' ) )
|
||||
verFfxInstall+=$( printf "%7s: %-7s " "$ii" "$( "$dirInstallFfx$ii"/firefox -v | grep -Eo '[0-9].*' )" )
|
||||
(( compteur2++ ))
|
||||
else
|
||||
verFfxInstall+=$( printf " %.s" $(seq 17) )
|
||||
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"
|
||||
|
|
@ -516,35 +532,35 @@ ffx_get_version(){ # 04/03/2018
|
|||
}
|
||||
|
||||
# ascii art godzilla
|
||||
ffx_godzilla(){ # 5/12/2017
|
||||
ffx_godzilla(){ # 09/03/2018
|
||||
|
||||
echo -n "$RED"
|
||||
cat << 'EOF'
|
||||
_.-~-.
|
||||
7'' Q..\
|
||||
_7 (_
|
||||
_7 _/ _q. /
|
||||
_7 . ___ /VVvv-'_ .
|
||||
7/ / /~- \_\\ '-._ .-' / //
|
||||
./ ( /-~-/||'=.__ '::. '-~'' { ___ / // ./{
|
||||
V V-~-~| || __''_ ':::. ''~-~.___.-'' _/ // / {_ / { /
|
||||
VV/-~-~-|/ \ .'__'. '. ':: _ _ _ ''.
|
||||
/ /~~~~||VVV/ / \ ) \ _ __ ___ ___ ___(_) | | __ _ .::'
|
||||
/ (~-~-~\\.-' / \' \::::. | '_ ' _ \ / _ \_ / | | |/ _' | :::'
|
||||
/..\ /..\__/ ' '::: | | | | | | (_) / /| | | | (_| | ::'
|
||||
vVVv vVVv ': |_| |_| |_|\___/___|_|_|_|\__,_| ''
|
||||
_.-~-.
|
||||
7'' Q..\
|
||||
_7 (_
|
||||
_7 _/ _q. /
|
||||
_7 . ___ /VVvv-'_ .
|
||||
7/ / /~- \_\\ '-._ .-' / //
|
||||
./ ( /-~-/||'=.__ '::. '-~'' { ___ / // ./{
|
||||
V V-~-~| || __''_ ':::. ''~-~.___.-'' _/ // / {_ / { /
|
||||
VV/-~-~-|/ \ .'__'. '. ':: _ _ _ ''.
|
||||
/ /~~~~||VVV/ / \ ) \ _ __ ___ ___ ___(_) | | __ _ .::'
|
||||
/ (~-~-~\\.-' / \' \::::. | '_ ' _ \ / _ \_ / | | |/ _' | :::'
|
||||
/..\ /..\__/ ' '::: | | | | | | (_) / /| | | | (_| | ::'
|
||||
vVVv vVVv ': |_| |_| |_|\___/___|_|_|_|\__,_| ''
|
||||
EOF
|
||||
echo "$STD"
|
||||
}
|
||||
|
||||
# installation, $1 canal [$2='manuel', $3 archive]
|
||||
ffx_install(){ # 04/03/2018
|
||||
ffx_install(){ # 09/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 )" )
|
||||
f__info "installation manuelle dans $canal de $appli version $verArchive ($( 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"
|
||||
else
|
||||
|
|
@ -563,8 +579,9 @@ ffx_install(){ # 04/03/2018
|
|||
recup_url="https://download.mozilla.org/?product=firefox-$canal-latest-l10n-ssl&os=$fu_archi&lang=fr"
|
||||
fi
|
||||
mkdir -p "$dirTemp"
|
||||
wget -q -c --show-progress --tries=2 --timeout=15 --user-agent="$user_agent" -o /dev/null -O "$fileTemp" "$recup_url"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$recup_url"
|
||||
if ! wget -q -c --show-progress --tries=2 --timeout=15 --user-agent="$user_agent" -o /dev/null -O "$fileTemp" "$recup_url" ; then
|
||||
f__wget_test "$recup_url"
|
||||
fi
|
||||
fi
|
||||
f__archive_test "$fileTemp" || f__error "Le fichier $fileTemp n'est pas une archive tar.gz valide"
|
||||
echo
|
||||
|
|
@ -574,8 +591,8 @@ ffx_install(){ # 04/03/2018
|
|||
|
||||
# mise en place finale
|
||||
f__info " - installation..."
|
||||
rm -rf "/opt/firefox-$canal/" # effacement ancien répertoire éventuel
|
||||
rm -rf "$dirInstallFfx$canal"/ # effacement éventuel répertoire existant
|
||||
rm -fr "/opt/firefox-$canal" # effacement ancien répertoire éventuel
|
||||
rm -fr "$dirInstallFfx$canal" # effacement éventuel répertoire existant
|
||||
mkdir -p "$dirInstallFfx$canal"
|
||||
mv -f "$dirTemp/firefox/"* "$dirInstallFfx$canal/"
|
||||
chown -R "$fu_user:" "$dirInstallFfx$canal/"
|
||||
|
|
@ -585,7 +602,7 @@ ffx_install(){ # 04/03/2018
|
|||
chown "$fu_user:" "$fileTemp"
|
||||
mv "$fileTemp" ./
|
||||
fi
|
||||
rm -rf "$dirTemp/"
|
||||
rm -fr "$dirTemp"
|
||||
|
||||
# traitement finaux système
|
||||
ln -sf "$dirInstallFfx$canal/browser/chrome/icons/default/default48.png" "/usr/share/pixmaps/firefox-$canal.png"
|
||||
|
|
@ -594,10 +611,12 @@ ffx_install(){ # 04/03/2018
|
|||
unlink "/usr/bin/firefox-$canal" &>/dev/null
|
||||
unlink "/usr/bin/firefox" &>/dev/null
|
||||
# lanceur dans /usr/bin
|
||||
echo "#!/bin/sh" > "/usr/bin/firefox-$canal"
|
||||
echo >> "/usr/bin/firefox-$canal"
|
||||
echo "echo \"\$@\" | grep -qE '\-P|\-\-ProfileManager' && exec $dirInstallFfx$canal/firefox -P || \\" >> "/usr/bin/firefox-$canal"
|
||||
echo " exec $dirInstallFfx$canal/firefox -P $canal \"\$@\"" >> "/usr/bin/firefox-$canal"
|
||||
{
|
||||
echo "#!/bin/sh"
|
||||
echo
|
||||
echo "echo \"\$@\" | grep -qE '\-P|\-\-ProfileManager' && exec $dirInstallFfx$canal/firefox -P || \\"
|
||||
echo " exec $dirInstallFfx$canal/firefox -P $canal \"\$@\""
|
||||
} >> "/usr/bin/firefox-$canal"
|
||||
chmod a+x "/usr/bin/firefox-$canal"
|
||||
|
||||
ffx_config_profil "$canal" # traitement de profile.ini
|
||||
|
|
@ -620,50 +639,53 @@ ffx_install_manuel(){ # 18/12/2017
|
|||
}
|
||||
|
||||
# création lanceur.desktop, $1=canal
|
||||
ffx_lanceur_desktop(){ # 16/01/2018
|
||||
ffx_lanceur_desktop(){ # 09/03/2018
|
||||
local canal="$1" fileDesktop="/usr/share/applications/firefox-$1.desktop"
|
||||
|
||||
[ -d "$dirInstallFfx$canal" ] || return 0 # pas d'installation? sortie
|
||||
|
||||
echo "[Desktop Entry]" > "$fileDesktop"
|
||||
echo "Name=$appli $canal" >> "$fileDesktop"
|
||||
echo "Name[fr]=$appli $canal" >> "$fileDesktop"
|
||||
echo "X-GNOME-FullName=$appli-$canal Web Browser" >> "$fileDesktop"
|
||||
echo "X-GNOME-FullName[fr]=$appli-$canal Navigateur Web" >> "$fileDesktop"
|
||||
echo "StartupWMClass=$appli-$canal" >> "$fileDesktop"
|
||||
echo "Exec=$dirInstallFfx$canal/firefox %u" >> "$fileDesktop"
|
||||
# default128.png: disparu dans beta, esr, latest, mozicon128 ok sauf nightly! mais default128 ok nightly
|
||||
if [ -e "$dirInstallFfx$canal/browser/icons/mozicon128.png" ]; then
|
||||
echo "Icon=$dirInstallFfx$canal/browser/icons/mozicon128.png" >> "$fileDesktop"
|
||||
elif [ -e "$dirInstallFfx$canal/browser/chrome/icons/default/default128.png" ]; then
|
||||
echo "Icon=$dirInstallFfx$canal/browser/chrome/icons/default/default128.png" >> "$fileDesktop"
|
||||
else
|
||||
echo "Icon=$dirInstallFfx$canal/browser/chrome/icons/default/default48.png" >> "$fileDesktop"
|
||||
fi
|
||||
echo "Comment=Browse the World Wide Web" >> "$fileDesktop"
|
||||
echo "Comment[fr]=Naviguer sur Internet" >> "$fileDesktop"
|
||||
echo "GenericName=Web Browser" >> "$fileDesktop"
|
||||
echo "GenericName[fr]=Navigateur Web" >> "$fileDesktop"
|
||||
echo "Terminal=false" >> "$fileDesktop"
|
||||
echo "X-MultipleArgs=false" >> "$fileDesktop"
|
||||
echo "Type=Application" >> "$fileDesktop"
|
||||
echo "Categories=Network;WebBrowser;" >> "$fileDesktop"
|
||||
echo "MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https;" >> "$fileDesktop"
|
||||
echo "StartupNotify=true" >> "$fileDesktop"
|
||||
echo "[Desktop Entry]" > "$fileDesktop"
|
||||
{
|
||||
echo "Name=$appli $canal"
|
||||
echo "Name[fr]=$appli $canal"
|
||||
echo "X-GNOME-FullName=$appli-$canal Web Browser"
|
||||
echo "X-GNOME-FullName[fr]=$appli-$canal Navigateur Web"
|
||||
echo "StartupWMClass=$appli-$canal"
|
||||
echo "Exec=/usr/bin/firefox-$canal %u"
|
||||
# default128.png: disparu dans beta, esr, latest, mozicon128 ok sauf nightly! mais default128 ok nightly
|
||||
if [ -e "$dirInstallFfx$canal/browser/icons/mozicon128.png" ]; then
|
||||
echo "Icon=$dirInstallFfx$canal/browser/icons/mozicon128.png"
|
||||
elif [ -e "$dirInstallFfx$canal/browser/chrome/icons/default/default128.png" ]; then
|
||||
echo "Icon=$dirInstallFfx$canal/browser/chrome/icons/default/default128.png"
|
||||
else
|
||||
echo "Icon=$dirInstallFfx$canal/browser/chrome/icons/default/default48.png"
|
||||
fi
|
||||
echo "Comment=Browse the World Wide Web"
|
||||
echo "Comment[fr]=Naviguer sur Internet"
|
||||
echo "GenericName=Web Browser"
|
||||
echo "GenericName[fr]=Navigateur Web"
|
||||
echo "Terminal=false"
|
||||
echo "X-MultipleArgs=false"
|
||||
echo "Type=Application"
|
||||
echo "Categories=Network;WebBrowser;"
|
||||
echo "MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https;"
|
||||
echo "StartupNotify=true"
|
||||
} >> "$fileDesktop"
|
||||
}
|
||||
|
||||
# version personnalisation en ligne, [$1=quiet], assigne $perso_ffx_afaire
|
||||
ffx_pers_get_version(){ # 04/03/2018
|
||||
ffx_pers_get_version(){ # 09/03/2018
|
||||
local ii verEnPlace persEnPlace verPersOnline
|
||||
|
||||
x_ffx_pers_get_version=1
|
||||
|
||||
for ii in $produit_all; do
|
||||
if [ -e "$dirProfilFfx/$ii/personnalisation" ]; then
|
||||
verEnPlace=$( sed -n '2p' $dirProfilFfx/$ii/personnalisation )
|
||||
verEnPlace=$( sed -n '2p' "$dirProfilFfx/$ii/personnalisation" )
|
||||
persEnPlace+="$ii: $verEnPlace "
|
||||
fi
|
||||
verPersOnline=$( wget -q --tries=2 --timeout=15 -o /dev/null -O - "$urlPersFfx/$userFfx" | sed -En 's/\/\*v(.*)\*\//\1/p' )
|
||||
[ "$?" -ne 0 ] && f__wget_test "$urlPersFfx/$userFfx"
|
||||
if ! verPersOnline=$( wget -q --tries=2 --timeout=15 -o /dev/null -O - "$urlPersFfx/$userFfx" | sed -En 's/\/\*v(.*)\*\//\1/p' ) ; then
|
||||
f__wget_test "$urlPersFfx/$userFfx"
|
||||
fi
|
||||
if [ -z "$verPersOnline" ]; then
|
||||
verPersOnline="${RED}non accessible"
|
||||
fi
|
||||
|
|
@ -673,15 +695,15 @@ ffx_pers_get_version(){ # 04/03/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"
|
||||
}
|
||||
|
||||
# recup user.js et chrome/userChrome.css, $1=canal à personnaliser ou mettre à jour
|
||||
ffx_pers_install(){ # 24/01/2018
|
||||
ffx_pers_install(){ # 09/03/2018
|
||||
local verPersDL canal="$1" dirTemp="/tmp/$script-persInstall_ffx"
|
||||
|
||||
if [ ! -d "$dirProfilFfx/$canal" ]; then
|
||||
|
|
@ -690,11 +712,13 @@ ffx_pers_install(){ # 24/01/2018
|
|||
fi
|
||||
# chargement fichiers personnalisation
|
||||
mkdir -p "$dirTemp"
|
||||
wget -q --tries=2 --timeout=15 -o /dev/null -O "$dirTemp/user.js" "$urlPersFfx/$userFfx"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$urlPersFfx/$userFfx"
|
||||
if ! wget -q --tries=2 --timeout=15 -o /dev/null -O "$dirTemp/user.js" "$urlPersFfx/$userFfx" ; then
|
||||
if__wget_test "$urlPersFfx/$userFfx"
|
||||
fi
|
||||
verPersDL=$( sed -En 's/\/\*v(.*)\*\//\1/p' $dirTemp/user.js ) # version uniquement sur user.js
|
||||
wget -q --tries=1 --timeout=15 -o /dev/null -O "$dirTemp/userChrome.css" "$urlPersFfx/$chromeFfx"
|
||||
[ "$?" -ne 0 ] && f__wget_test "$urlPersFfx/$chromeFfx"
|
||||
if ! wget -q --tries=1 --timeout=15 -o /dev/null -O "$dirTemp/userChrome.css" "$urlPersFfx/$chromeFfx" ; then
|
||||
f__wget_test "$urlPersFfx/$chromeFfx"
|
||||
fi
|
||||
# installation
|
||||
mkdir -p "$dirProfilFfx/$canal/chrome" # répertoire pour userChrome.css
|
||||
chown "$fu_user:" "$dirProfilFfx/$canal/chrome"
|
||||
|
|
@ -707,7 +731,7 @@ ffx_pers_install(){ # 24/01/2018
|
|||
echo "$urlPersFfx" > "$dirProfilFfx/$canal/personnalisation"
|
||||
echo "$verPersDL" >> "$dirProfilFfx/$canal/personnalisation"
|
||||
chown "$fu_user:" "$dirProfilFfx/$canal/personnalisation"
|
||||
rm -rf "$dirTemp/"
|
||||
rm -fr "$dirTemp"
|
||||
|
||||
f__info "log" "personnalisation $verPersDL mise en place pour $appli $canal"
|
||||
}
|
||||
|
|
@ -740,8 +764,8 @@ ffx_pers_upgrade(){ # 21/12/2017
|
|||
}
|
||||
|
||||
# désinstallation, $1=canal
|
||||
ffx_remove(){ # 14/01/2018
|
||||
local canal="$1" fileDesktop="/usr/share/applications/firefox-$1.desktop"
|
||||
ffx_remove(){ # 09/03/2018
|
||||
local canal="$1"
|
||||
|
||||
if [ ! -d "$dirInstallFfx$canal" ]; then
|
||||
f__info "$appli $canal n'est pas installé"
|
||||
|
|
@ -750,7 +774,7 @@ ffx_remove(){ # 14/01/2018
|
|||
|
||||
killall "$dirInstallFfx$canal/firefox" &>/dev/null
|
||||
# suppression du répertoire
|
||||
rm -rf "$dirInstallFfx$canal/"
|
||||
rm -fr "$dirInstallFfx$canal"
|
||||
# suppression lanceurs
|
||||
rm -f "/usr/share/applications/firefox-$canal.desktop"
|
||||
rm -f "/usr/bin/firefox-$canal"
|
||||
|
|
@ -758,8 +782,8 @@ ffx_remove(){ # 14/01/2018
|
|||
unlink "/usr/share/pixmaps/firefox-$canal.png" &>/dev/null
|
||||
unlink "/usr/bin/firefox" &>/dev/null
|
||||
#finalisation system
|
||||
update-alternatives --quiet --remove 'x-www-browser' /usr/bin/firefox-$canal # &>/dev/null inutile avec --quiet
|
||||
update-alternatives --quiet --remove 'gnome-www-browser' /usr/bin/firefox-$canal # &>/dev/null inutile avec --quiet
|
||||
update-alternatives --quiet --remove 'x-www-browser' "/usr/bin/firefox-$canal"
|
||||
update-alternatives --quiet --remove 'gnome-www-browser' "/usr/bin/firefox-$canal"
|
||||
|
||||
# canal bas comme nouveau défaut
|
||||
ffx_get_canalBas && ffx_config_system "$ffx_canal_bas"
|
||||
|
|
@ -773,8 +797,8 @@ ffx_remove(){ # 14/01/2018
|
|||
ffx_godzilla
|
||||
}
|
||||
|
||||
# tache upgrade dans anacron hebdomadaire, via cron horaire, $1=upgrade|install|remove
|
||||
fscript_cronAnacron(){ # 26/01/2018
|
||||
# anacron hebdomadaire, via cron horaire, $1=upgrade|install|remove
|
||||
fscript_cronAnacron(){ # 07/03/2018
|
||||
local dirAnacron dirSpool fileAnacron
|
||||
|
||||
type -t fscript_cronAnacron_special &>/dev/null && fscript_cronAnacron_special # test, si fonction spécifique, appel
|
||||
|
|
@ -801,23 +825,26 @@ fscript_cronAnacron(){ # 26/01/2018
|
|||
grep -q "$script" "/etc/crontab" || echo f__error "inscription crontab"
|
||||
;;
|
||||
remove )
|
||||
rm -f "$dirSpool/$script"* &>/dev/null
|
||||
rm -f "$fileAnacron" &>/dev/null
|
||||
rmdir "$dirSpool" "$dirAnacron" &>/dev/null
|
||||
rm -f "${dirSpool:?}/$script"* 2>/dev/null
|
||||
rm -f "$fileAnacron"
|
||||
rmdir "$${dirSpool:?}" "${dirAnacron:?}" 2>/dev/null
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# version script, [$1=quiet], assigne $ver_script_install, $ver_script_online, $script_a_jour=ok|KO
|
||||
fscript_get_version(){ # 24/01/2018
|
||||
|
||||
# [$1=quiet], assigne $ver_script_install, $ver_script_online, $script_a_jour=ok|KO
|
||||
# shellcheck disable=SC2120
|
||||
# SC2120 function references arguments, but none are ever passed. (quiet)
|
||||
fscript_get_version(){ # 06/03/2018
|
||||
x_script_get_version=1
|
||||
|
||||
# version online
|
||||
ver_script_online=$( wget -q --timeout=15 -o /dev/null -O - "$url_script" | grep -m1 '^version=' | cut -d'=' -f2 )
|
||||
[ "$?" -ne 0 ] && f__wget_test "$url_script"
|
||||
if ! ver_script_online=$( wget -q --timeout=15 -o /dev/null -O - "$url_script" | grep -m1 '^version=' | cut -d'=' -f2 ); then
|
||||
f__wget_test "$url_script"
|
||||
fi
|
||||
# version installée
|
||||
if [ -e "$script_install" ]; then
|
||||
ver_script_install=$( grep -m1 '^version=' $script_install | cut -d'=' -f2 )
|
||||
ver_script_install=$( grep -m1 '^version=' "$script_install" | cut -d'=' -f2 )
|
||||
fi
|
||||
|
||||
if [[ "$ver_script_online" && "$script_install" ]]; then
|
||||
|
|
@ -831,7 +858,6 @@ fscript_get_version(){ # 24/01/2018
|
|||
f__info "script en ligne: $YELLOW$ver_script_online"
|
||||
}
|
||||
|
||||
# installation du script dans le système
|
||||
fscript_install(){ # 24/02/2018
|
||||
|
||||
if grep -Eq "$script_install|/usr/bin/$script" <<< "$0"; then
|
||||
|
|
@ -856,7 +882,6 @@ fscript_install(){ # 24/02/2018
|
|||
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(){ # 24/02/2018
|
||||
|
||||
if ! grep -Eq "$script_install|/usr/bin/$script" <<< "$0"; then
|
||||
|
|
@ -878,8 +903,10 @@ fscript_remove(){ # 24/02/2018
|
|||
f__info "log" "$script $version supprimé du système."
|
||||
}
|
||||
|
||||
# mise à jour script, [$1 != "" si upgrade en place, $1 dans message info]
|
||||
fscript_update(){ # 01/03/2018
|
||||
# si upgrade en place, $1 != "", [$1 message info]
|
||||
# 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
|
||||
|
|
@ -895,9 +922,8 @@ fscript_update(){ # 01/03/2018
|
|||
f__info "mise à jour en cours"
|
||||
fi
|
||||
mkdir -p "$dirTemp"
|
||||
wget -q --tries=2 --timeout=15 -o /dev/null -O "$dirTemp/$script" "$url_script"
|
||||
if [ "$?" -ne 0 ]; then
|
||||
rm -rf "$dirTemp"
|
||||
if ! wget -q --tries=2 --timeout=15 -o /dev/null -O "$dirTemp/$script" "$url_script"; then
|
||||
rm -fr "$dirTemp"
|
||||
f__wget_test "$url_script"
|
||||
fi
|
||||
if grep -q '#!/bin/bash' "$dirTemp/$script" && grep -q '^### END CONTROL' "$dirTemp/$script"; then
|
||||
|
|
@ -905,18 +931,17 @@ fscript_update(){ # 01/03/2018
|
|||
chmod 775 "$script_install" # rwx rwx r-x, proprio fu_user
|
||||
chown "$fu_user:" "$script_install"
|
||||
[ -z "$upgradeEnPlace" ] && fscript_cronAnacron "upgrade"
|
||||
f__info "log" "$script mis à jour en version $ver_script_online $updateSpecial"
|
||||
f__info "log" "$script mis à jour en version $ver_script_online $upgradeEnPlace"
|
||||
else
|
||||
f_info "log" "$script: échec update" "mauvais téléchargement, réessayer plus tard"
|
||||
fi
|
||||
rm -rf "$dirTemp/"
|
||||
rm -fr "$dirTemp"
|
||||
}
|
||||
|
||||
prg_init(){ # 04/03/2018
|
||||
prg_init(){ # 09/03/2018
|
||||
|
||||
PATH='/usr/sbin:/usr/bin:/sbin:/bin'
|
||||
TERM=xterm
|
||||
IFS_INI="$IFS"
|
||||
IFS=$' \t\n'
|
||||
export PATH TERM IFS
|
||||
|
||||
|
|
@ -925,7 +950,7 @@ prg_init(){ # 04/03/2018
|
|||
shopt -u force_fignore execfail failglob
|
||||
|
||||
# test bash v4
|
||||
[ "$BASH_VERSINFO" == 4 ] || f__error "bash v4 requis" "version installée: $BASH_VERSION"
|
||||
[ "${BASH_VERSINFO[0]}" == 4 ] || f__error "bash v4 requis" "version installée: $BASH_VERSION"
|
||||
|
||||
# architectures possibles
|
||||
f__architecture || f__error "Seules les architecture 32 et/ou 64 bits sont supportée (i686 & amd64)"
|
||||
|
|
@ -936,7 +961,11 @@ prg_init(){ # 04/03/2018
|
|||
[ "$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 ] && fu_user="root" || f__error "user détecté, mais pas de home: /home/$fu_user"
|
||||
if [ "$EUID" -eq 0 ]; then
|
||||
fu_user="root"
|
||||
else
|
||||
f__error "user détecté, mais pas de home: /home/$fu_user"
|
||||
fi
|
||||
f__info "user root"
|
||||
fi
|
||||
|
||||
|
|
@ -972,7 +1001,7 @@ produit_all_inverse="nightly beta latest esr" # tous les canaux sauf dev (=bet
|
|||
# url chargement fichiers personnalisation, std ou spécifique, une seule url possible, arrêt à la première trouvée
|
||||
for ii in $produit_all dev; do
|
||||
if [ -e "$dirProfilFfx/$ii/personnalisation" ]; then
|
||||
urlPersFfx=$( sed -n '1p' $dirProfilFfx/$ii/personnalisation )
|
||||
urlPersFfx=$( sed -n '1p' "$dirProfilFfx/$ii/personnalisation" )
|
||||
else
|
||||
urlPersFfx="https://framagit.org/kyodev/kyopages/raw/master/scripts"
|
||||
fi
|
||||
|
|
@ -987,21 +1016,15 @@ for ii in $produit_all dev; do
|
|||
done
|
||||
|
||||
|
||||
options=$@
|
||||
options="$*"
|
||||
# auto-installation script éventuel, si pas de marqueur $fileDev
|
||||
if [[ $( dirname $0 ) != $( dirname $script_install ) && $( dirname $0 ) != "/usr/bin" && ! -e "$fileDev" ]]; then
|
||||
if [[ $( dirname "$0" ) != $( dirname "$script_install" ) && $( dirname "$0" ) != "/usr/bin" && ! -e "$fileDev" ]]; then
|
||||
options="-i" # option installation script
|
||||
fi
|
||||
[ "$options" ] || options="-h" # vide help
|
||||
|
||||
for j in $options; do # première passe options
|
||||
case $j in
|
||||
-i | --install | -r | --remove | ri | i-* | m-* | r-* | u-* )
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
f__info "vous devez être$RED ROOT$BLUE pour cette opération"
|
||||
f__sudo "exec $0 $@"
|
||||
exit
|
||||
fi
|
||||
;;&
|
||||
--sauve )
|
||||
dl_to_svg="ok"
|
||||
;;&
|
||||
|
|
@ -1009,10 +1032,16 @@ for j in $options; do # première passe options
|
|||
done
|
||||
options=${options//--sauve/ }
|
||||
|
||||
[ "$options" ] || options="-h" # vide? help
|
||||
|
||||
for j in $options; do # deuxième passe options, actions
|
||||
case $j in
|
||||
-i | --install | -r | --remove | ri | i-* | m-* | r-* | u-* )
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
f__info "vous devez être$RED ROOT$BLUE pour cette opération"
|
||||
f__sudo "exec $0 $*"
|
||||
exit
|
||||
fi
|
||||
;;&
|
||||
d-latest | d-esr | d-dev | d-beta | d-nightly | d-all )
|
||||
produit=${j#*-}
|
||||
[ "$produit" == "all" ] && produit="$produit_all"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,18 @@ todo
|
|||
* numérotation archive sauvée
|
||||
* révision extraction n° version
|
||||
|
||||
## getFirefox 4.19.0 09/03/2018
|
||||
|
||||
* lint: shellcheck
|
||||
* lift: revue traitement options
|
||||
* révision: f_affichage
|
||||
* synchro: f__color f__info f__log f__requis f__sudo f__user
|
||||
* synchro: fscript_cronAnacron fscript_get_version fscript_update
|
||||
* fix: ffx_lanceur_desktop, plusieurs versions simultanées possibles, réparer avec `getFirefox ri`
|
||||
|
||||
## getFirefox 4.18.0 04/03/2018
|
||||
|
||||
* lint
|
||||
|
||||
## getFirefox 4.17.1 04/03/2018
|
||||
|
||||
|
|
@ -15,7 +27,7 @@ todo
|
|||
|
||||
## getFirefox 4.16.1 11/02/2018
|
||||
|
||||
* syncro: f__color
|
||||
* synchro: f__color
|
||||
|
||||
## getFirefox 4.16.0 01/02/2018
|
||||
|
||||
|
|
@ -63,7 +75,7 @@ fix: ffx_config_system, alternatives si primo installation avec aucune alternati
|
|||
|
||||
## getFirefox 4.9.0 29/12/2017
|
||||
|
||||
* syncro composants
|
||||
* synchro composants
|
||||
|
||||
## getFirefox 4.8.1 27/12/2017
|
||||
|
||||
|
|
@ -115,7 +127,7 @@ fix: ffx_remove, oubli suppression lien dans /usr/bin
|
|||
|
||||
## getFirefox 3.14.1 15/12/2017
|
||||
|
||||
* syncro f__architecture
|
||||
* synchro f__architecture
|
||||
|
||||
## getFirefox 3.14.0 13/12/2017
|
||||
|
||||
|
|
@ -129,7 +141,7 @@ fix: ffx_remove, oubli suppression lien dans /usr/bin
|
|||
## 3.12.1 5/12/2017
|
||||
|
||||
* révision: démarrage
|
||||
* révision: syncro fonctions communes
|
||||
* révision: synchro fonctions communes
|
||||
* révision: suppression avertissement ESR, compatibilité
|
||||
* révision: f_tor_install, ffx_install, renommage $architecture
|
||||
* révision: f_tor_install, f_tor_lanceur_desktop, f_tor_pers_install, ffx_install,
|
||||
|
|
|
|||
Loading…
Reference in New Issue