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_3 has been updated
via df10014490ca945c1248303c35ceb8754dbb4ce6 (commit)
from 78a6eed0ccc24d58ead1fcb2d0aa1279388bbc39 (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 df10014490ca945c1248303c35ceb8754dbb4ce6
Author: Sylvain Beucler <[email protected]>
Date: Wed Jun 18 11:15:59 2014 +0200
mediawiki: fix paths in import/export scripts (use forge_get_config +
s/wikidata/projects/)
diff --git a/src/CHANGES b/src/CHANGES
index 8554ea3..c230d3f 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -2,6 +2,7 @@ Fusionforge-5.3.2:
* Software map: fix "value too long for type character varying(255)" error in
cron db_trove_maint.php (Inria)
* SCM Git: suppress 'warning: You appear to have cloned an empty repository.'
in create_scm_repos.php (Inria)
* SCM Git: handle bad encoding when gathering stats (Inria)
+* Plugin mediawiki: fix paths in import/export scripts (Inria)
Fusionforge-5.3.1:
* Docman: Basic Webdav write mkcol support (TrivialDev)
diff --git a/src/plugins/mediawiki/bin/mw-fulldump
b/src/plugins/mediawiki/bin/mw-fulldump
old mode 100644
new mode 100755
index c2b6111..79e042b
--- a/src/plugins/mediawiki/bin/mw-fulldump
+++ b/src/plugins/mediawiki/bin/mw-fulldump
@@ -4,6 +4,7 @@
#
# Copyright © 2013
# Thorsten “mirabilos” Glaser <[email protected]>
+# Copyright (C) 2014 Inria (Sylvain Beucler)
# All rights reserved.
#
# This file is part of FusionForge. FusionForge is free software;
@@ -20,33 +21,42 @@
# You should have received a copy of the GNU General Public License along
# with FusionForge; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#-
+
# Dumps all pages of a FusionForge MediaWiki plugin project, with their
# complete history, plus all images and other files, into a tarball to
# be imported into another wiki by mw-fullrestore.
-if [[ $# != 1 || $1 = *[[:space:]]* || -e $1.fulldump || \
- ! -d /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/. ]]; then
+wikiprojectdir=$(forge_get_config projects_path mediawiki)/$1
+if [[ $# != 1 || $1 = *[[:space:]]* ]]; then
echo 'Syntax: mw-fulldump projectname' 1>&2
exit 255
fi
+if [[ -e $1.fulldump ]]; then
+ echo "Dump already exists: $1.fulldump" 1>&2
+ exit 255
+fi
+# The wiki may not have uploaded any image, don't check.
+#if [[ ! -d $wikiprojectdir/images/. ]]; then
+# echo "Couldn't find image directory $wikiprojectdir/images/"
+# exit 255
+#fi
wd=$PWD
set -x
set -e
-rm -rf "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"
-mkdir "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"
-cd "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"
-/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+rm -rf "$wikiprojectdir/fulldump"
+mkdir "$wikiprojectdir/fulldump"
+cd "$wikiprojectdir/fulldump"
+$(forge_get_config source_path)/plugins/mediawiki/bin/mw-wrapper.php "$1" \
dumpUploads.php >mf1.txt
sed \
-
"smwstore://local-backend/local-public/var/lib/gforge/plugins/mediawiki/wikidata/$1/images"
\
+ "smwstore://local-backend/local-public$wikiprojectdir/images" \
<mf1.txt >mf2.txt
mkdir mfi
if [[ -s mf2.txt ]]; then
ln $(<mf2.txt) mfi/
fi
-/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+$(forge_get_config source_path)/plugins/mediawiki/bin/mw-wrapper.php "$1" \
dumpBackup.php --full >df.xml
rm -f mf?.txt
cd ..
diff --git a/src/plugins/mediawiki/bin/mw-fullrestore
b/src/plugins/mediawiki/bin/mw-fullrestore
old mode 100644
new mode 100755
index 9593912..f9c3cb9
--- a/src/plugins/mediawiki/bin/mw-fullrestore
+++ b/src/plugins/mediawiki/bin/mw-fullrestore
@@ -4,6 +4,7 @@
#
# Copyright © 2013
# Thorsten “mirabilos” Glaser <[email protected]>
+# Copyright (C) 2014 Inria (Sylvain Beucler)
# All rights reserved.
#
# This file is part of FusionForge. FusionForge is free software;
@@ -20,33 +21,33 @@
# You should have received a copy of the GNU General Public License along
# with FusionForge; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#-
+
# Restores all pages and images from a file stored by mw-fulldump.
# Passing not a file generated by mw-fulldump is Undefined Behaviour.
#
# 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 = *[[:space:]]* || ! -s $2 || \
- ! -d /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/. ]]; then
+wikiprojectdir=$(forge_get_config projects_path mediawiki)/$1
+if [[ $# != 2 || $1 = *[[:space:]]* || ! -s $2 ]]; then
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" && tar xzf -) <"$2"
-cd "/var/lib/gforge/plugins/mediawiki/wikidata/$1/fulldump"
-/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+rm -rf "$wikiprojectdir/fulldump"
+(cd "$wikiprojectdir" && tar xzf -) <"$2"
+cd "$wikiprojectdir/fulldump"
+$(forge_get_config source_path)/plugins/mediawiki/bin/mw-wrapper.php "$1" \
importImages.php mfi/
-/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+$(forge_get_config source_path)/plugins/mediawiki/bin/mw-wrapper.php "$1" \
importDump.php df.xml
cd ..
rm -rf fulldump
chown -R www-data:www-data \
- "/var/lib/gforge/plugins/mediawiki/wikidata/$1/images"
-/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" \
+ "$wikiprojectdir/images"
+$(forge_get_config source_path)/plugins/mediawiki/bin/mw-wrapper.php "$1" \
rebuildrecentchanges.php
-/usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php "$1" update.php --quick
+$(forge_get_config source_path)/plugins/mediawiki/bin/mw-wrapper.php "$1"
update.php --quick
exit 0
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/plugins/mediawiki/bin/mw-fulldump | 28 +++++++++++++++++++---------
src/plugins/mediawiki/bin/mw-fullrestore | 23 ++++++++++++-----------
3 files changed, 32 insertions(+), 20 deletions(-)
mode change 100644 => 100755 src/plugins/mediawiki/bin/mw-fulldump
mode change 100644 => 100755 src/plugins/mediawiki/bin/mw-fullrestore
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
