From 3523cdc4a441e9fb2d8fcc020b04bd819b3019b8 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 4 Oct 2018 23:49:31 +0100 Subject: cope with md5sum being named different things on bsd --- utils/jenkins-build.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index be71d8974..cff753af0 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -443,8 +443,18 @@ if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then fi # create package checksum files -md5sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 -sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha + +# find md5sum binary +MD5SUM=md5sum; +command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=md5 +command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=echo + +# find sha256 binary name +SHAR256SUM=sha256sum +command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo + +${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 +${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha ############ Package artifact deployment ################ @@ -453,18 +463,20 @@ sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha DESTDIR=/srv/ci.netsurf-browser.org/html/builds/${TARGET}/ NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}" +OLD_ARTIFACT_TARGETS="" -for SUFFIX in "${PKG_SFX}" .md5 .sha;do +for SUFFIX in "${PKG_SFX}" .md5 .sha256;do # copy the file to the output - always use scp as it works local or remote scp "${PKG_SRC}${SUFFIX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET}${SUFFIX} # remove the local file artifact rm -f "${PKG_SRC}${SUFFIX}" + + OLD_ARTIFACT_TARGETS=${OLD_ARTIFACT_TARGETS} "${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" done ############ Expired package artifact removal and latest linking ############## -OLD_ARTIFACT_TARGET="NetSurf-${OLD_IDENTIFIER}${PKG_SFX}" -ssh netsurf@ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" +ssh netsurf@ci.netsurf-browser.org "rm -f ${OLD_ARTIFACT_TARGETS} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" -- cgit v1.2.3