From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 14 Jun 2018 17:23:33 +0000 (+0200)
Subject: maintenance: Update update-oojs.sh to use misc files from package
X-Git-Tag: 1.34.0-rc.0~5056^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=658227bd2bdd097e334412e026a733f17f79c300;p=lhc%2Fweb%2Fwiklou.git

maintenance: Update update-oojs.sh to use misc files from package

These are already included in the package. Using them from the dist/
directory is somewhat against the way things are normally done in NPM,
given the repository itself already becomes the package.

If we were building a separate directory for a tarball, that
would make more sense, but that isn't the case.

Note: In verions prior to OOjs v2.2.1, all files were included in the package,
version v2.2.1 added the 'files' whitelist which included only dist/, LICENSE*,
README*, History* and package.json, which in particular means AUTHORS.txt
is missing. This was fixed in v2.2.2 on the same day. MediaWiki will upgrade
from v2.2.0 to v2.2.2 directly.

Change-Id: I4bd91811c754addac6c9826e91580eff47c7c5d6
---

diff --git a/maintenance/resources/update-oojs.sh b/maintenance/resources/update-oojs.sh
index f99bb7d756..fd7b860d1d 100755
--- a/maintenance/resources/update-oojs.sh
+++ b/maintenance/resources/update-oojs.sh
@@ -38,9 +38,9 @@ fi
 
 # Copy file(s)
 rsync --force ./node_modules/oojs/dist/oojs.jquery.js "$REPO_DIR/$TARGET_DIR"
-rsync --force ./node_modules/oojs/dist/AUTHORS.txt "$REPO_DIR/$TARGET_DIR"
-rsync --force ./node_modules/oojs/dist/LICENSE-MIT "$REPO_DIR/$TARGET_DIR"
-rsync --force ./node_modules/oojs/dist/README.md "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/AUTHORS.txt "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/LICENSE-MIT "$REPO_DIR/$TARGET_DIR"
+rsync --force ./node_modules/oojs/README.md "$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"