Projet

Général

Profil

« Précédent | Suivant » 

Révision b22ef68c

Ajouté par Ermal il y a presque 10 ans

Do proper arithmetic instead of mixing string with number in comparions

Voir les différences:

builder_scripts/build_snapshots.sh
107 107
		PFSENSE_CURRENT_COMMIT=$(git_last_commit "${GIT_REPO_DIR}/pfSenseGITREPO" origin/${PFSENSETAG})
108 108
		if [ "${PFSENSE_LAST_COMMIT}" != "${PFSENSE_CURRENT_COMMIT}" ]; then
109 109
			update_status ">>> New commit: $CURRENT_AUTHOR - $PFSENSE_CURRENT_COMMIT .. No longer sleepy."
110
			COUNTER="`expr $maxsleepvalue + 60`"
110
			COUNTER=$(($maxsleepvalue + 60))
111 111
			export PFSENSE_LAST_COMMIT="${PFSENSE_CURRENT_COMMIT}"
112
			return
113 112
		fi
114 113
		TOOLS_CURRENT_COMMIT=$(git_last_commit "${BUILDER_SCRIPTS}" origin)
115 114
		if [ "${TOOLS_LAST_COMMIT}" != "${TOOLS_CURRENT_COMMIT}" ]; then
116 115
			update_status ">>> New commit: $CURRENT_AUTHOR - $TOOLS_CURRENT_COMMIT .. No longer sleepy."
117
			COUNTER="`expr $maxsleepvalue + 60`"
116
			COUNTER=$(($maxsleepvalue + 60))
118 117
			export TOOLS_LAST_COMMIT="${TOOLS_CURRENT_COMMIT}"
119
			return
120 118
		fi
121
		COUNTER="`expr $COUNTER + 60`"
119
		COUNTER=$(($COUNTER + 60))
122 120
	done
123 121
	if [ $COUNTER -ge $maxsleepvalue ]; then
124 122
		update_status ">>> Sleep timer expired. Restarting build."

Formats disponibles : Unified diff