iankelling.org
/
git
/
mediawiki-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated to latest
[mediawiki-setup]
/
mw-setup-script
diff --git
a/mw-setup-script
b/mw-setup-script
index 599766800be8cc5fd03f44723c68fec04092a8ee..1c356d4e587149fba6306c5994d677391b45a540 100755
(executable)
--- a/
mw-setup-script
+++ b/
mw-setup-script
@@
-19,7
+19,7
@@
mw-clone() {
local url=$1
local original_pwd="$PWD"
local name
local url=$1
local original_pwd="$PWD"
local name
- local re='[^/]*/[^/]*$'
+ local re='[^/]*/[^/]*$'
# last 2 parts of path
[[ $url =~ $re ]] ||:
target=$mw/${BASH_REMATCH[0]}
if [[ ! -e $target/.git ]]; then
[[ $url =~ $re ]] ||:
target=$mw/${BASH_REMATCH[0]}
if [[ ! -e $target/.git ]]; then
@@
-37,11
+37,10
@@
mw-clone() {
}
mw-ext () {
local ext
}
mw-ext () {
local ext
- for ext
in "$@"
; do
+ for ext; do
mw-clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/$ext
mw-clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/$ext
- if [[ -e $mw/ext/$ext/extension.json ]]; then
- # new style extension. remove old style declaration
- sed -i --follow-symlinks '#^require_once( "\\\$IP/extensions/\$ext/\$ext\.php" );#d' $mwc
+ if [[ -e $mw/extensions/$ext/extension.json ]]; then
+ # new style extension
teeu $mwc <<EOF
wfLoadExtension( '$ext' );
EOF
teeu $mwc <<EOF
wfLoadExtension( '$ext' );
EOF
@@
-149,8
+148,8
@@
fi
# git branch -r
git checkout -f origin/$mw_branch
git clean -ffxd
# git branch -r
git checkout -f origin/$mw_branch
git clean -ffxd
-# a
dd some librejs support:
-curl "https://iankelling.org/git/?p=mediawiki-librejs-patch;a=blob_plain;f=mediawiki-
librejs-patch;hb=HEAD" | bash
+# a
pply librejs patch
+curl "https://iankelling.org/git/?p=mediawiki-librejs-patch;a=blob_plain;f=mediawiki-
1.28-librejs.patch;hb=HEAD" | patch -r - -N -p1
# Get the php libraries wmf uses. Based on:
# https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries
if [[ ! -e vendor/.git ]]; then
# Get the php libraries wmf uses. Based on:
# https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries
if [[ ! -e vendor/.git ]]; then
@@
-568,7
+567,7
@@
for dir in extensions/* skins/* vendor; do
update "$dir" ||:
done
if update .; then
update "$dir" ||:
done
if update .; then
- curl "https://iankelling.org/git/?p=mediawiki-librejs-patch;a=blob_plain;f=mediawiki-
librejs-patch;hb=HEAD" | bash
+ curl "https://iankelling.org/git/?p=mediawiki-librejs-patch;a=blob_plain;f=mediawiki-
1.28-librejs.patch;hb=HEAD" | patch -r - -N -p1
fi
php $mw/maintenance/update.php -q --quick
EOF
fi
php $mw/maintenance/update.php -q --quick
EOF