r97116 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97115‎ | r97116 | r97117 >
Date:23:46, 14 September 2011
Author:aaron
Status:deferred
Tags:
Comment:
* Removed damaging quotes around for loop array (only worked when there was one item)
* Avoid use of old-fashioned backticks for command output capturing
* Renamed $IP var to $mwIP
Modified paths:
  • /trunk/debs/wikimedia-task-appserver/scap-1skins (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/scap-2 (modified) (history)

Diff [purge]

Index: trunk/debs/wikimedia-task-appserver/scap-2
@@ -13,14 +13,13 @@
1414 fi
1515
1616 # wikiversions.dat just synced above
17 -mwVersionNums=`mwversionsinuse`
 17+mwVersionNums=$(mwversionsinuse)
1818 if [ -z "$mwVersionNums" ]; then
1919 echo "Unable to read wikiversions.dat or it is empty"
2020 exit 1
2121 fi
2222
23 -for mwVerNum in "${mwVersionNums[@]}"
24 -do
 23+for mwVerNum in ${mwVersionNums[@]}; do
2524 echo "MediaWiki $mwVerNum: Compiling texvc..."
2625 builddir=`mktemp -dt texvc-build.XXXXXXXXXX`
2726 if [ -z "$builddir" ]; then
@@ -28,12 +27,12 @@
2928 exit 1
3029 fi
3130
32 - IP=/usr/local/apache/common-local/php-"$mwVerNum"
 31+ mwIP=/usr/local/apache/common-local/php-"$mwVerNum"
3332 # Math was moved out to an extension in MW 1.18
34 - if [ -d $IP/extensions/Math/math ]; then
35 - MATHPATH=$IP/extensions/Math/math
 33+ if [ -d $mwIP/extensions/Math/math ]; then
 34+ MATHPATH=$mwIP/extensions/Math/math
3635 else
37 - MATHPATH=$IP/math
 36+ MATHPATH=$mwIP/math
3837 fi
3938
4039 rsync -r --exclude=.svn/ $MATHPATH/ "$builddir"
Index: trunk/debs/wikimedia-task-appserver/scap-1skins
@@ -1,8 +1,12 @@
22 #!/bin/bash
33
4 -mwVersionNums=`mwversionsinuse`
5 -for mwVerNum in "${mwVersionNums[@]}"
6 -do
 4+mwVersionNums=$(mwversionsinuse)
 5+if [ -z "$mwVersionNums" ]; then
 6+ echo "Unable to read wikiversions.dat or it is empty"
 7+ exit 1
 8+fi
 9+
 10+for mwVerNum in ${mwVersionNums[@]}; do
711 sudo -u mwdeploy sh -c "
812 rsync -a --no-perms 10.0.5.8::common/php-$mwVerNum/skins/ \
913 /usr/local/apache/common-local/php-$mwVerNum/skins && \

Follow-up revisions

RevisionCommit summaryAuthorDate
r97119MFT r97116aaron23:52, 14 September 2011

Status & tagging log