jenkins-bot has submitted this change and it was merged.
Change subject: Re-sync bin/update-oojs.sh with equivalent script in MediaWiki
core
......................................................................
Re-sync bin/update-oojs.sh with equivalent script in MediaWiki core
Change-Id: Iaf52db137a773cdeb7894382f04aaae9d679ee91
---
M bin/update-oojs.sh
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/update-oojs.sh b/bin/update-oojs.sh
index 167b796..6787da3 100755
--- a/bin/update-oojs.sh
+++ b/bin/update-oojs.sh
@@ -7,12 +7,12 @@
exit 1
fi
-REPO_DIR=$(cd $(dirname $0)/..; pwd) # Root dir of the git repo working tree
-TARGET_DIR=lib/oojs # Destination relative to the root of the repo
-NPM_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs'` # e.g.
/tmp/update-oojs.rI0I5Vir
+REPO_DIR=$(cd "$(dirname $0)/../.."; pwd) # Root dir of the git repo working
tree
+TARGET_DIR="lib/oojs" # Destination relative to the root of the repo
+NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs') # e.g.
/tmp/update-oojs.rI0I5Vir
# Prepare working tree
-cd $REPO_DIR &&
+cd "$REPO_DIR" &&
git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin &&
git checkout -B upstream-oojs origin/master || exit 1
@@ -20,7 +20,7 @@
cd $NPM_DIR
if [ -n "$1" ]
then
- npm install oojs@$1 || exit 1
+ npm install "oojs@$1" || exit 1
else
npm install oojs || exit 1
fi
@@ -33,10 +33,10 @@
fi
# Copy file(s)
-rsync --recursive --delete --force ./node_modules/oojs/dist
$REPO_DIR/$TARGET_DIR || exit 1
+rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR"
|| exit 1
# Clean up temporary area
-rm -rf $NPM_DIR
+rm -rf "$NPM_DIR"
# Generate commit
cd $REPO_DIR || exit 1
--
To view, visit https://gerrit.wikimedia.org/r/155460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf52db137a773cdeb7894382f04aaae9d679ee91
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
