jenkins-bot has submitted this change and it was merged.
Change subject: mw-core-get.sh: bug fixing
......................................................................
mw-core-get.sh: bug fixing
* git archive returns non ziped archive, so drop 'z' from tar
* missing whitespace in if condition
Change-Id: Id22611657e891bd7079a066c424eb03d560085f2
---
M bin/mw-core-get.sh
1 file changed, 5 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-core-get.sh b/bin/mw-core-get.sh
index 3e9d118..04660b7 100755
--- a/bin/mw-core-get.sh
+++ b/bin/mw-core-get.sh
@@ -13,13 +13,11 @@
exit 1
fi
-function tar_extract() {
- (cd "$WORKSPACE" && tar xzf -)
-}
-
-if [ -d "$GIT_LOCAL"]; then
- git archive --remote="$GIT_LOCAL" "$TREE_ISH" | tar_extract
+if [ -d "$GIT_LOCAL" ]; then
+ git archive --remote="$GIT_LOCAL" "$TREE_ISH" \
+ | (cd "$WORKSPACE" && tar xf -)
else
# Fallback to git.wikimedia.org
- curl
"https://git.wikimedia.org/zip/?r=mediawiki/core.git&format=gz&h=$TREE_ISH"; |
tar_extract
+ curl
"https://git.wikimedia.org/zip/?r=mediawiki/core.git&format=gz&h=$TREE_ISH"; \
+ | (cd "$WORKSPACE" && tar xzf -)
fi
--
To view, visit https://gerrit.wikimedia.org/r/97517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id22611657e891bd7079a066c424eb03d560085f2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
