* set -e: Abort on error.
* set -u: Emit error for undefined variables.
This removes the need for endless "&&"-chains and easy-to-forget
"|| exit 1" statements.
Change-Id: I41a1c0d1bd57b5e241b83224096d32876fd913af
# This script generates a commit that updates our copy of OOjs UI
# This script generates a commit that updates our copy of OOjs UI
then
# Too many parameters
echo >&2 "Usage: $0 [<version>]"
then
# Too many parameters
echo >&2 "Usage: $0 [<version>]"
NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs-ui') # e.g. /tmp/update-oojs-ui.rI0I5Vir
# Prepare working tree
NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs-ui') # e.g. /tmp/update-oojs-ui.rI0I5Vir
# Prepare working tree
-cd "$REPO_DIR" &&
-git reset composer.json && git checkout composer.json &&
-git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin &&
-git checkout -B upstream-oojs-ui origin/master || exit 1
+cd "$REPO_DIR"
+git reset composer.json
+git checkout composer.json
+git reset -- $TARGET_DIR
+git checkout -- $TARGET_DIR
+git fetch origin
+git checkout -B upstream-oojs-ui origin/master
# Fetch upstream version
cd $NPM_DIR
# Fetch upstream version
cd $NPM_DIR
- npm install "oojs-ui@$1" || exit 1
+ npm install "oojs-ui@$1"
- npm install oojs-ui || exit 1
fi
OOJSUI_VERSION=$(node -e 'console.log(require("./node_modules/oojs-ui/package.json").version);')
fi
OOJSUI_VERSION=$(node -e 'console.log(require("./node_modules/oojs-ui/package.json").version);')
fi
# Copy files, picking the necessary ones from source and distribution
fi
# Copy files, picking the necessary ones from source and distribution
-rm -r "$REPO_DIR/$TARGET_DIR" || exit 1
-mkdir -p "$REPO_DIR/$TARGET_DIR/i18n" || exit 1
-mkdir -p "$REPO_DIR/$TARGET_DIR/images" || exit 1
-mkdir -p "$REPO_DIR/$TARGET_DIR/themes/mediawiki/images" || exit 1
-cp ./node_modules/oojs-ui/dist/{oojs-ui-mediawiki-noimages.css,oojs-ui-mediawiki.js,oojs-ui.js} "$REPO_DIR/$TARGET_DIR" || exit 1
-cp -R ./node_modules/oojs-ui/dist/i18n "$REPO_DIR/$TARGET_DIR" || exit 1
-cp -R ./node_modules/oojs-ui/dist/images "$REPO_DIR/$TARGET_DIR" || exit 1
-cp -R ./node_modules/oojs-ui/dist/themes/mediawiki/images "$REPO_DIR/$TARGET_DIR/themes/mediawiki" || exit 1
-cp ./node_modules/oojs-ui/src/themes/mediawiki/*.json "$REPO_DIR/$TARGET_DIR/themes/mediawiki" || exit 1
+rm -r "$REPO_DIR/$TARGET_DIR"
+mkdir -p "$REPO_DIR/$TARGET_DIR/i18n"
+mkdir -p "$REPO_DIR/$TARGET_DIR/images"
+mkdir -p "$REPO_DIR/$TARGET_DIR/themes/mediawiki/images"
+cp ./node_modules/oojs-ui/dist/{oojs-ui-mediawiki-noimages.css,oojs-ui-mediawiki.js,oojs-ui.js} "$REPO_DIR/$TARGET_DIR"
+cp -R ./node_modules/oojs-ui/dist/i18n "$REPO_DIR/$TARGET_DIR"
+cp -R ./node_modules/oojs-ui/dist/images "$REPO_DIR/$TARGET_DIR"
+cp -R ./node_modules/oojs-ui/dist/themes/mediawiki/images "$REPO_DIR/$TARGET_DIR/themes/mediawiki"
+cp ./node_modules/oojs-ui/src/themes/mediawiki/*.json "$REPO_DIR/$TARGET_DIR/themes/mediawiki"
# Clean up temporary area
rm -rf "$NPM_DIR"
# Generate commit
# Clean up temporary area
rm -rf "$NPM_DIR"
# Generate commit
COMMITMSG=$(cat <<END
Update OOjs UI to v$OOJSUI_VERSION
COMMITMSG=$(cat <<END
Update OOjs UI to v$OOJSUI_VERSION
composer require oojs/oojs-ui $OOJSUI_VERSION --no-update
# Stage deletion, modification and creation of files. Then commit.
composer require oojs/oojs-ui $OOJSUI_VERSION --no-update
# Stage deletion, modification and creation of files. Then commit.
-git add --update $TARGET_DIR && git add $TARGET_DIR && git add composer.json && git commit -m "$COMMITMSG" || exit 1
+git add --update $TARGET_DIR
+git add $TARGET_DIR
+git add composer.json
+git commit -m "$COMMITMSG"
# This script generates a commit that updates our copy of OOjs
# This script generates a commit that updates our copy of OOjs
then
# Too many parameters
echo >&2 "Usage: $0 [<version>]"
then
# Too many parameters
echo >&2 "Usage: $0 [<version>]"
NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs') # e.g. /tmp/update-oojs.rI0I5Vir
# Prepare working tree
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
# Fetch upstream version
cd $NPM_DIR
- npm install "oojs@$1" || exit 1
- npm install oojs || exit 1
fi
OOJS_VERSION=$(node -e 'console.log(require("./node_modules/oojs/package.json").version);')
fi
OOJS_VERSION=$(node -e 'console.log(require("./node_modules/oojs/package.json").version);')
-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
# Clean up temporary area
rm -rf "$NPM_DIR"
# Generate commit
COMMITMSG=$(cat <<END
Update OOjs to v$OOJS_VERSION
COMMITMSG=$(cat <<END
Update OOjs to v$OOJS_VERSION
)
# Stage deletion, modification and creation of files. Then commit.
)
# 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"