latest updates

[mediawiki-setup] / mw-setup-script

diff --git a/mw-setup-script b/mw-setup-script
index 40b5cfaf952ae30e0799f1e5ec15866b5f61aeef..5cdfd145186b6a8775926d6e03637f847460fa41 100755 (executable)
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -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
@@ -540,17 +542,31 @@ source ~/mw_vars
 cd $mw
 git fetch --all
 git checkout origin/$mw_branch
-git rebase ian/REL1_23-toolbox-in-dropdown
-cd extensions
+cd $mw/skins/Vector
+git fetch --all -q
+x=ian-kelling/REL1_27-toolbox-in-dropdown
+log=$(git log HEAD..$x)
+if [[ $log ]]; then
+    pwd
+    echo "$log"
+fi
+git checkout -q $x
+cd $mw/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 ..
+    [[ -d $x ]] || continue
+    cd $x
+    git fetch --all -q
+    x=$(git rev-parse origin/$mw_branch 2>/dev/null) || \
+      x=$(git rev-parse origin/master)
+    log=$(git log HEAD..$x)
+    if [[ $log ]]; then
+        pwd
+        echo "$log"
     fi
+    git checkout -q $x
+    cd ..
 done
 php $mw/maintenance/update.php -q
 EOF
-chmod +x $s
+
 # </source>