[ARVADOS-DEV] updated: 598d191de7ae6033ababaefcfcfc973e13ccdcbe
git at public.curoverse.com
git at public.curoverse.com
Fri Jun 26 14:59:17 EDT 2015
Summary of changes:
jenkins/run-build-packages.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
via 598d191de7ae6033ababaefcfcfc973e13ccdcbe (commit)
from 5cb61be1c7a900d9d872c8b037f158e3c10f40bc (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.
commit 598d191de7ae6033ababaefcfcfc973e13ccdcbe
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri Jun 26 14:55:22 2015 -0400
Regex match fixes in the character class match for $FPM_RESULTS:
a) we want to match a literal dot, not any character
b) bash 4.2 does not support escaping a dash to include it in the
character class, move the dash to the last character listed in the class
refs #6389
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index b2c7ce3..37dc5a4 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -307,7 +307,7 @@ fpm_verify_and_scp () {
FPM_RESULTS=$@
FPM_PACKAGE_NAME=''
- if [[ $FPM_RESULTS =~ ([A-Za-z0-9_\-.]*\.)(deb|rpm) ]]; then
+ if [[ $FPM_RESULTS =~ ([A-Za-z0-9_\.-]*\.)(deb|rpm) ]]; then
FPM_PACKAGE_NAME=${BASH_REMATCH[1]}${BASH_REMATCH[2]}
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list