Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/3523cdc4a441e9fb2d8fcc020b04bd819b3019b8
...commit
http://git.netsurf-browser.org/netsurf.git/commit/3523cdc4a441e9fb2d8fcc020b04bd819b3019b8
...tree
http://git.netsurf-browser.org/netsurf.git/tree/3523cdc4a441e9fb2d8fcc020b04bd819b3019b8
The branch, master has been updated
via 3523cdc4a441e9fb2d8fcc020b04bd819b3019b8 (commit)
from ef5333672435c094c6088da8052838b43020c66e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3523cdc4a441e9fb2d8fcc020b04bd819b3019b8
commit 3523cdc4a441e9fb2d8fcc020b04bd819b3019b8
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
cope with md5sum being named different things on bsd
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index be71d89..cff753a 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}"
[email protected]:${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 [email protected] "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET}
${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" >
${DESTDIR}/LATEST"
+ssh [email protected] "rm -f ${OLD_ARTIFACT_TARGETS}
${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" >
${DESTDIR}/LATEST"
-----------------------------------------------------------------------
Summary of changes:
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 be71d89..cff753a 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}"
[email protected]:${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 [email protected] "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET}
${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" >
${DESTDIR}/LATEST"
+ssh [email protected] "rm -f ${OLD_ARTIFACT_TARGETS}
${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" >
${DESTDIR}/LATEST"
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
