diff options
Diffstat (limited to 'maintenance/resources/update-oojs.sh')
| -rw-r--r-- | maintenance/resources/update-oojs.sh | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/maintenance/resources/update-oojs.sh b/maintenance/resources/update-oojs.sh index 1d5c2b17..b91cb281 100644 --- a/maintenance/resources/update-oojs.sh +++ b/maintenance/resources/update-oojs.sh @@ -1,8 +1,8 @@ -#!/usr/bin/env bash +#!/bin/bash -eu # This script generates a commit that updates our copy of OOjs -if [ -n "$2" ] +if [ -n "${2:-}" ] then # Too many parameters echo >&2 "Usage: $0 [<version>]" @@ -14,17 +14,19 @@ TARGET_DIR="resources/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" && -git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin && -git checkout -B upstream-oojs origin/master || exit 1 +cd "$REPO_DIR" +git reset -- $TARGET_DIR +git checkout -- $TARGET_DIR +git fetch origin +git checkout -B upstream-oojs origin/master # Fetch upstream version cd $NPM_DIR -if [ -n "$1" ] +if [ -n "${1:-}" ] then - npm install "oojs@$1" || exit 1 + npm install "oojs@$1" else - npm install oojs || exit 1 + npm install oojs fi OOJS_VERSION=$(node -e 'console.log(require("./node_modules/oojs/package.json").version);') @@ -35,13 +37,13 @@ then fi # Copy file(s) -rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR" || exit 1 +rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR" # Clean up temporary area rm -rf "$NPM_DIR" # Generate commit -cd $REPO_DIR || exit 1 +cd $REPO_DIR COMMITMSG=$(cat <<END Update OOjs to v$OOJS_VERSION @@ -52,4 +54,6 @@ END ) # Stage deletion, modification and creation of files. Then commit. -git add --update $TARGET_DIR && git add $TARGET_DIR && git commit -m "$COMMITMSG" || exit 1 +git add --update $TARGET_DIR +git add $TARGET_DIR +git commit -m "$COMMITMSG" |