Projet

Général

Profil

« Précédent | Suivant » 

Révision b1145cd3

Ajouté par Ermal il y a presque 10 ans

Mark this as string to not make sh have wrong assumption

Voir les différences:

builder_scripts/build_snapshots.sh
91 91 
		(cd ${1} && git fetch && git rebase ${2})>/dev/null
92 92 
		CURRENT_COMMIT=$(cd "${1}" && git log | head -n1 | cut -d' ' -f2)
93 93 
		echo ">>> CURRENT_COMMIT: ${CURRENT_COMMIT} on ${1}"
94 
		return $CURRENT_COMMIT
94 
		return "$CURRENT_COMMIT"
95 95 
	else
96 96 
		update_status ">>> WARNING: pfSenseGITREPO variable not set! Previous commit functions disabled."
97 97 
	fi
......
104 104 
	COUNTER=0
105 105 
	while [ $COUNTER -lt $maxsleepvalue ]; do
106 106 
		sleep 60
107 
		PFSENSE_CURRENT_COMMIT=$(git_last_commit "${GIT_REPO_DIR}/pfSenseGITREPO" origin/${PFSENSETAG})
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 110 
			COUNTER=$(($maxsleepvalue + 60))
111 111 
			export PFSENSE_LAST_COMMIT="${PFSENSE_CURRENT_COMMIT}"
112 112 
		fi
113 
		TOOLS_CURRENT_COMMIT=$(git_last_commit "${BUILDER_SCRIPTS}" origin)
113 
		TOOLS_CURRENT_COMMIT="$(git_last_commit "${BUILDER_SCRIPTS}" origin)"
114 114 
		if [ "${TOOLS_LAST_COMMIT}" != "${TOOLS_CURRENT_COMMIT}" ]; then
115 115 
			update_status ">>> New commit: $CURRENT_AUTHOR - $TOOLS_CURRENT_COMMIT .. No longer sleepy."
116 116 
			COUNTER=$(($maxsleepvalue + 60))

Formats disponibles : Unified diff