diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 9b62ffc..7e919a1 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -67,8 +67,15 @@ echo $timebar # # # ACTIVATE 5 MN "git pull" update -[[ $(($minute % 5)) == 0 ]] && sleep $((1 + RANDOM % 12)) && cd $MY_PATH && git pull - +if [[ $(($minute % 5)) == 0 ]]; then + sleep $((1 + RANDOM % 12)) + cd $MY_PATH + ### Remove files being in .gitignore + git checkout -- www/LOVELand/jukebox/prefs/collection.sq3 + git checkout -- www/LOVELand/jukebox/prefs/prefs.var + ####################################### + git pull +fi # __________ ____ __ ________ ___________ # / ___/ ___// __ ) \ \ / _/ __ \/ ____/ ___/ @@ -142,7 +149,10 @@ if [[ "$timebar" == "00:01" ]]; then [[ $jourdelasemaine == 0 ]] && mv -f /tmp/astroport.log ~/.zen/astroport.$numerosemaine.log # LOG BACKUP FOR 1 YEAR !! sleep $((1 + RANDOM % 10)) - # GIT PULL + + # GIT UPDATE + ./git-update.sh + git pull # UPDATE CODE git pull # Clear 24h ssb_GET markers