[Fusionforge-commits] FusionForge branch Branch_5_2 updated. bde056003fdcbf3e33fdff083bebe537506e1307

Roland Mas lolando at fusionforge.org
Thu Jul 18 11:41:59 CEST 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_2 has been updated
       via  bde056003fdcbf3e33fdff083bebe537506e1307 (commit)
      from  4c2f1b1e87b76e600a128cdc63bf0e8b222e9a81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bde056003fdcbf3e33fdff083bebe537506e1307
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jul 18 11:41:54 2013 +0200

    Ported scripts to standard bash+tar (instead of mksh+paxtar)

diff --git a/src/plugins/mediawiki/bin/mw-fulldump b/src/plugins/mediawiki/bin/mw-fulldump
index 2ed27b5..063e757 100644
--- a/src/plugins/mediawiki/bin/mw-fulldump
+++ b/src/plugins/mediawiki/bin/mw-fulldump
@@ -1,4 +1,4 @@
-#!/bin/mksh
+#!/bin/bash
 #-
 # MediaWiki Plugin full dump/restore for FusionForge
 #
@@ -25,9 +25,9 @@
 # complete history, plus all images and other files, into a tarball to
 # be imported into another wiki by mw-fullrestore.
 
-if [[ $# != 1 || $1 = *@([	 ])* || -e $1.fulldump || \
+if [[ $# != 1 || $1 *[[:space:]]* || -e $1.fulldump || \
     ! -d /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/. ]]; then
-	print -u2 'Syntax: mw-fulldump projectname'
+	echo 'Syntax: mw-fulldump projectname' 1>&2
 	exit 255
 fi
 
@@ -50,6 +50,6 @@ fi
     dumpBackup.php --full >df.xml
 rm -f mf?.txt
 cd ..
-paxtar -M dist -czf "$wd/$1.fulldump" fulldump
+tar czf "$wd/$1.fulldump" --numeric-owner --owner=0 --group=0 fulldump
 rm -rf fulldump
 exit 0
diff --git a/src/plugins/mediawiki/bin/mw-fullrestore b/src/plugins/mediawiki/bin/mw-fullrestore
index 6d2f005..9593912 100644
--- a/src/plugins/mediawiki/bin/mw-fullrestore
+++ b/src/plugins/mediawiki/bin/mw-fullrestore
@@ -1,4 +1,4 @@
-#!/bin/mksh
+#!/bin/bash
 #-
 # MediaWiki Plugin full dump/restore for FusionForge
 #
@@ -27,16 +27,16 @@
 # Existing pages and files in the wiki will not be deleted; existing
 # pages with same names as those in the dump will be overwritten I guess.
 
-if [[ $# != 2 || $1 = *@([       ])* || ! -s $2 || \
+if [[ $# != 2 || $1 = *[[:space:]]* || ! -s $2 || \
     ! -d /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/. ]]; then
-	print -u2 'Syntax: mw-fullrestore tgtprojectname src.fulldump'
+	echo 'Syntax: mw-fullrestore tgtprojectname src.fulldump' 1>&2
 	exit 255
 fi
 
 set -x
 set -e
 rm -rf "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"
-(cd "/var/lib/gforge/plugins/mediawiki/wikidata/$1" && paxtar -xzf -) <"$2"
+(cd "/var/lib/gforge/plugins/mediawiki/wikidata/$1" && tar xzf -) <"$2"
 cd "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"
 /usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
     importImages.php mfi/

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/mediawiki/bin/mw-fulldump    |    8 ++++----
 src/plugins/mediawiki/bin/mw-fullrestore |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list