Skip to content

Commit a048aeb

Browse files
authored
Merge pull request #16 from imagejan/fix-xmllint-on-windows
Replace quotes for xmllint on Windows Git Bash
2 parents cbc3ed2 + a014cc8 commit a048aeb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

travisify.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ process() {
6666
cd "$1"
6767

6868
# -- Git sanity checks --
69-
repoSlug=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='scm']/*[local-name()='connection']" pom.xml|sed 's_.*github.com[:/]\(.*\)<.*_\1_')
69+
repoSlug=$(xmllint --xpath '//*[local-name()="project"]/*[local-name()="scm"]/*[local-name()="connection"]' pom.xml|sed 's_.*github.com[:/]\(.*\)<.*_\1_')
7070
test "$repoSlug" && info "Repository = $repoSlug" || die 'Could not determine GitHub repository slug'
7171
git fetch >/dev/null
7272
git diff-index --quiet HEAD -- || die "Dirty working copy"
@@ -78,7 +78,7 @@ process() {
7878
# die "Mismatch with upstream branch (local ahead?)"
7979

8080
# -- POM sanity checks --
81-
parent=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='parent']/*[local-name()='artifactId']" pom.xml|sed 's/[^>]*>//'|sed 's/<.*//')
81+
parent=$(xmllint --xpath '//*[local-name()="project"]/*[local-name()="parent"]/*[local-name()="artifactId"]' pom.xml|sed 's/[^>]*>//'|sed 's/<.*//')
8282
test "$parent" = "pom-scijava" ||
8383
die "Not pom-scijava parent: $parent"
8484

@@ -129,7 +129,7 @@ EOL
129129
$EXEC git diff-index --quiet HEAD -- || $EXEC git ci -m "Travis: remove obsolete files"
130130

131131
# Upgrade version of pom-scijava.
132-
version=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='parent']/*[local-name()='version']" pom.xml|sed 's/[^>]*>//'|sed 's/<.*//')
132+
version=$(xmllint --xpath '//*[local-name()="project"]/*[local-name()="parent"]/*[local-name()="version"]' pom.xml|sed 's/[^>]*>//'|sed 's/<.*//')
133133
# HACK: Using a lexicographic comparison here is imperfect.
134134
if [ "$version" \< "$pomMinVersion" ]
135135
then

0 commit comments

Comments
 (0)