new snapshot, url update

[mediawiki-setup] / mw-setup-script

diff --git a/mw-setup-script b/mw-setup-script
index 12f0c45316fef8397baa22ca00f48cf55c209616..62701d50e11a355076aaa286f4451b3c38f600f8 100755 (executable)
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -40,7 +40,7 @@ mw-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 '#^require_once( "\\\$IP/extensions/\$ext/\$ext\.php" );#d' $mwc
+            sed -i --follow-symlinks '#^require_once( "\\\$IP/extensions/\$ext/\$ext\.php" );#d' $mwc
             teeu $mwc <<EOF
 wfLoadExtension( '$ext' );
 EOF
@@ -57,8 +57,8 @@ EOF
 mw-skin() {
     local skin=$1
     mw-clone https://gerrit.wikimedia.org/r/p/mediawiki/skins/$skin
-    sed -i '/^wfLoadSkin/d' $mwc
-    sed -i '/^\$wgDefaultSkin/d' $mwc
+    sed -i --follow-symlinks '/^wfLoadSkin/d' $mwc
+    sed -i --follow-symlinks '/^\$wgDefaultSkin/d' $mwc
     teeu $mwc <<EOF
 \$wgDefaultSkin = "${skin,,*}";
 wfLoadSkin( '$skin' );
@@ -87,21 +87,23 @@ if isdeb; then
     # main reference:
     # https://www.mediawiki.org/wiki/Manual:Running_MediaWiki_on_Ubuntu
     apt-get update
-    apt-get install -y imagemagick php-mbstring
+    apt-get install -y imagemagick
     if apt-get install -s mediawiki &>/dev/null; then
         # in debian wheezy time-frame distros, mediawiki was packaged.
-        apt-get -y install php-apc mediawiki
+        apt-get -y install php-apc mediawiki php-mbstring
     else
         # https://www.mediawiki.org/wiki/Manual:Installation_requirements
         if apt-get install -s php7.0 &>/dev/null; then
             # note, 7.0 is untested by the editor here, since it's not
             # available in debian 8. it's listed as supported
             # in the mediawiki page.
-            # noninteractive to avoid mysql password prompt
+            # noninteractive to avoid mysql password prompt.
             DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 mysql-server \
                            php7.0 php7.0-mysql libapache2-mod-php7.0 php7.0-xml \
-                           php7.0-apcu
+                           php7.0-apcu php7.0-mbstring
         else
+            # note: mbstring is recommended, but it's not available for php5 in
+            # debian jessie.
             DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 mysql-server \
                            php5 php5-mysql libapache2-mod-php5 php5-apcu
         fi
@@ -178,7 +180,7 @@ git clone $git_site/acme-tiny-wrapper
 l=$mw/../../logs
 mkdir -p $l
 
-acme-tiny-wrapper/acme-tiny-wrapper $mwdomain
+acme-tiny-wrapper/acme-tiny-wrapper -t $mwdomain
 
 git clone $git_site/basic-https-conf
 { cat <<EOF
@@ -248,7 +250,7 @@ EOF
 # Increase from default of 2M to 100M.
 # This will at least allow high res pics etc.
 php_ini=$(php -r 'echo(php_ini_loaded_file());')
-sed -i 's/^\(upload_max_filesize\|post_max_size\)\b.*/\1 = 100M/' $php_ini
+sed -i --follow-symlinks 's/^\(upload_max_filesize\|post_max_size\)\b.*/\1 = 100M/' $php_ini
 if isdeb; then
     service apache2 restart
 else
@@ -270,7 +272,7 @@ EOF
 # Make the toolbox go into the drop down.
 cd $mw/skins/Vector
 if ! git remote show ian-kelling &>/dev/null; then
-    git remote add ian-kelling https://iankelling.org/git/Vector
+    git remote add ian-kelling https://iankelling.org/git/forks/Vector
 fi
 git fetch ian-kelling
 git checkout ian-kelling/REL1_27-toolbox-in-dropdown
@@ -408,7 +410,7 @@ EOF
 fi
 # </source>
 # <source lang="bash">
-sed -i "/\\\$wgGroupPermissions\\['\\*'\\]\\['createaccount'\\] = false;/d" $mwc
+sed -i --follow-symlinks "/\\\$wgGroupPermissions\\['\\*'\\]\\['createaccount'\\] = false;/d" $mwc
 # </source>
 # <source lang="bash">
 # get repo
@@ -530,7 +532,8 @@ div#mw-content-text {
 """)
 EOF
 
-python pwb.py ${mwfamily}_setup
+# this can spam a warning, so uniq it
+python pwb.py ${mwfamily}_setup |& uniq
 # </source>
 # <source lang="bash">
 s=/etc/cron.daily/mediawiki_update
@@ -538,19 +541,22 @@ dd of=$s<<'EOF'
 #!/bin/bash
 source ~/mw_vars
 cd $mw
-git fetch --all
-git checkout origin/$mw_branch
-git rebase ian/REL1_23-toolbox-in-dropdown
-cd extensions
-for x in *; do
-    if [[ -d $x ]]; then
-        cd $x
-        git fetch --all
-        git checkout origin/$mw_branch || git checkout -qf origin/master
-        cd ..
+for dir in extensions/* skins/* $mw; do
+    [[ -d $dir ]] || continue
+    cd $dir
+    branch=$(git describe --all)
+    branch=${branch#remotes/}
+    git fetch --all -q
+    new_head=$(git rev-parse $branch)
+    log=$(git log HEAD..$new_head)
+    if [[ $log ]]; then
+        pwd
+        echo "$log"
     fi
+    git checkout -q $new_head
+    cd $mw
 done
 php $mw/maintenance/update.php -q
 EOF
-chmod +x $s
+
 # </source>