Merge "Re-sync OOjs and OOjs UI update scripts"

diff --combined resources/oojs-ui/update-oojs-ui.sh
index a42ba0e,0761edb..6cf631f
--- 1/resources/oojs-ui/update-oojs-ui.sh
--- 2/resources/oojs-ui/update-oojs-ui.sh
+++ b/resources/oojs-ui/update-oojs-ui.sh
@@@ -37,6 -37,11 +37,11 @@@ f
  # Undo any changes in the oojs-ui directory
  git reset resources/oojs-ui/
  git checkout resources/oojs-ui/
+ 
+ git fetch origin
+ # Create a branch of MW if needed, and reset it to master
+ git checkout -B update-oojsui origin/master
+ 
  # Get the old oojs-ui version
  OLDVERSION=$(oojsuihash)
  if [ "x$OLDVERSION" == "x" ]
@@@ -64,7 -69,8 +69,8 @@@ the
        exit 0
  fi
  # Build the distribution
- grunt
+ npm install || exit 1
+ grunt || exit 1
  # Get the list of changes
  NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=never)
  NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=always)
@@@ -72,7 -78,7 +78,7 @@@
  cd -
  
  # Copy files from dist/ to resources/oojs-ui
 -cp -a $1/dist/{oojs-ui.js,oojs-ui.svg.css,images,i18n} resources/oojs-ui/
 +cp -a $1/dist/{oojs-ui.js,oojs-ui.svg.css,oojs-ui-apex.css,images,i18n} resources/oojs-ui/
  # Figure out what the new version is
  NEWVERSION=$(oojsuiversion)
  # Generate commit summary