mirror of https://framagit.org/kyodev/kyopages.git
1.5.0
This commit is contained in:
kyodev
parent
57ee7ba223
commit
e1eda5b0b2
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
version=1.4.2
|
||||
date="28/07/2017"
|
||||
version=1.5.0
|
||||
date="30/07/2017"
|
||||
projet="simpledebian"
|
||||
contact="IRC freenode ##sdeb ou https://framagit.org/kyodev/kyopages/issues"
|
||||
script="getFirefox"
|
||||
|
|
@ -79,7 +79,7 @@ f__user(){
|
|||
f__requis(){
|
||||
for i in $@; do
|
||||
if [ ! "$(which $i)" ]; then
|
||||
testDepends="ko"
|
||||
local testDepends="ko"
|
||||
f__info "$RED vous devez avoir la commande $i pour exploiter ce script"
|
||||
fi
|
||||
done
|
||||
|
|
@ -100,11 +100,11 @@ f__archive_test(){
|
|||
|
||||
# log spécifique, fichier log limité à 10000octets, $1 message à loguer
|
||||
f__log(){
|
||||
if [ -w "/var/log/sdeb_getFF.log" ]; then
|
||||
if [ "$(stat -c %s /var/log/sdeb_getFF.log)" -ge "10000" ]; then
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null > "/var/log/sdeb_getFF.log"
|
||||
if [ -w "$fileLogs" ]; then
|
||||
if [ "$(stat -c %s $fileLogs)" -ge "10000" ]; then
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null > "$fileLogs"
|
||||
else
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null >> "/var/log/sdeb_getFF.log"
|
||||
echo "$(date +%Y%m%d\ %H%M%S) $1" &>/dev/null >> "$fileLogs"
|
||||
fi
|
||||
else
|
||||
f__info "pour bénéficier de la nouvelle version des logs, vous devriez réinstaller manuellement $script" \
|
||||
|
|
@ -151,9 +151,9 @@ fscript_install(){
|
|||
# cron/anacron install
|
||||
fscript_cronAnacron "install"
|
||||
# création fichier log
|
||||
touch "/var/log/sdeb_getFF.log"
|
||||
chmod a+rwx "/var/log/sdeb_getFF.log"
|
||||
chown "$user_": "/var/log/sdeb_getFF.log"
|
||||
touch "$fileLogs"
|
||||
chmod a+rwx "$fileLogs"
|
||||
chown "$user_": "$fileLogs"
|
||||
[ -f "$script"_changelog.md ] || rm "$(basename $0)" &>/dev/null ## on efface pas si changelog (dev)
|
||||
f__info "$GREEN$script installé dans le système." "maintenant, appel du script par:$GREEN $script$BLUE (sans ./)"
|
||||
f__log "$script $version installé dans le système"
|
||||
|
|
@ -204,22 +204,25 @@ fscript_dl(){
|
|||
|
||||
# inscription dans tache upgrade en anacron hebdomadaire, via cron horaire
|
||||
fscript_cronAnacron(){
|
||||
local fileAnacron="/home/$user_/.mozilla/$script.anacrontab"
|
||||
case "$1" in
|
||||
install )
|
||||
# table anacron
|
||||
echo "7 05 getFF nice /opt/bin/$script upgrade &>/dev/null" > "/home/$user_/.mozilla/$script.anacrontab"
|
||||
## test: anacron journalier: echo "1 05 getFFtest nice /opt/bin/$script upgrade &>/dev/null" >> "/home/$user_/.mozilla/$script.anacrontab"
|
||||
chown "$user_": "/home/$user_/.mozilla/$script.anacrontab"
|
||||
# création spool anacron utilisateur
|
||||
mkdir -p "/home/$user_/.config/anacron/spool"
|
||||
chown "$user_": "/home/$user_/.config/anacron/spool"
|
||||
# cron tab pour activation horaire anacron
|
||||
echo "@hourly $user_ /usr/sbin/anacron -t /home/$user_/.mozilla/$script.anacrontab -S /home/$user_/.config/anacron/spool" >> /etc/crontab
|
||||
if [ ! -e "$fileAnacron" ]; then
|
||||
# table anacron
|
||||
echo "7 05 getFF nice /opt/bin/$script upgrade &>/dev/null" > "$fileAnacron"
|
||||
## test: anacron journalier: echo "1 05 getFFtest nice /opt/bin/$script upgrade &>/dev/null" >> "$fileAnacron"
|
||||
chown "$user_": "$fileAnacron"
|
||||
# création spool anacron utilisateur
|
||||
mkdir -p "/home/$user_/.config/anacron/spool"
|
||||
chown "$user_": "/home/$user_/.config/anacron/spool"
|
||||
# cron tab pour activation horaire anacron
|
||||
echo "@hourly $user_ /usr/sbin/anacron -t $fileAnacron -S /home/$user_/.config/anacron/spool" >> /etc/crontab
|
||||
fi
|
||||
;;
|
||||
remove )
|
||||
[ -e "/home/$user_/.config/anacron/spool/getFF" ] && rm "/home/$user_/.config/anacron/spool/getFF"
|
||||
sed -i "/^\@hourly.*$script.anacrontab.*$/d" /etc/crontab
|
||||
rm "/home/$user_/.mozilla/$script.anacrontab"
|
||||
rm "/home/$user_/.config/anacron/spool/getFF"* &>/dev/null
|
||||
sed -i "/^\@hourly.*$script.anacrontab.*$/d" /etc/crontab
|
||||
rm "$fileAnacron"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
@ -494,6 +497,7 @@ f__affichage
|
|||
f__architecture || f__error "Architecture non supportée"
|
||||
f__user
|
||||
f__requis "wget file tar killall"
|
||||
fileLogs="/var/log/sdeb_getFF.log"
|
||||
dirInstall="/opt/usr/share/firefox-"
|
||||
dirProfil="/home/$user_/.mozilla/firefox"
|
||||
fileProfileIni="$dirProfil/profiles.ini"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,11 @@
|
|||
## todo
|
||||
* install: copie du profil du canal inférieur?
|
||||
|
||||
## 1.5.0 30/07/2017
|
||||
|
||||
* lifting
|
||||
* fix bug mineur: pas d'inscription superflue dans crontab si plusieurs installations scripts successives
|
||||
|
||||
## 1.4.2 28/07/2017
|
||||
|
||||
* mieux: fichier log spécifique mais nécessite réinstallation en root (pas de mise à jour)
|
||||
|
|
|
|||
Loading…
Reference in New Issue