latest snapshot

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index dc5b427230827834bbeb291b6e49c7839a2dadc2..f2436bfbec1207a2ae7f359b73843fab1e809028 100644 (file)
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -874,7 +874,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>
 
 
@@ -987,31 +988,20 @@ dd of=$s<<'EOF'
 #!/bin/bash
 source ~/mw_vars
 cd $mw
-git fetch --all
-git checkout origin/$mw_branch
-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
-    [[ -d $x ]] || continue
-    cd $x
+for dir in extensions/* skins/* $mw; do
+    [[ -d $dir ]] || continue
+    cd $dir
+    branch=$(git describe --all)
+    branch=${branch#remotes/}
     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)
+    new_head=$(git rev-parse $branch)
+    log=$(git log HEAD..$new_head)
     if [[ $log ]]; then
         pwd
         echo "$log"
     fi
-    git checkout -q $x
-    cd ..
+    git checkout -q $new_head
+    cd $mw
 done
 php $mw/maintenance/update.php -q
 EOF

diff --git a/mw-setup-script b/mw-setup-script
index 5cdfd145186b6a8775926d6e03637f847460fa41..dc73ee737824479a4d8afe66d15ad04ac8dd47c3 100755 (executable)
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -532,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
@@ -540,31 +541,20 @@ dd of=$s<<'EOF'
 #!/bin/bash
 source ~/mw_vars
 cd $mw
-git fetch --all
-git checkout origin/$mw_branch
-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
-    [[ -d $x ]] || continue
-    cd $x
+for dir in extensions/* skins/* $mw; do
+    [[ -d $dir ]] || continue
+    cd $dir
+    branch=$(git describe --all)
+    branch=${branch#remotes/}
     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)
+    new_head=$(git rev-parse $branch)
+    log=$(git log HEAD..$new_head)
     if [[ $log ]]; then
         pwd
         echo "$log"
     fi
-    git checkout -q $x
-    cd ..
+    git checkout -q $new_head
+    cd $mw
 done
 php $mw/maintenance/update.php -q
 EOF