[Fusionforge-commits] FusionForge branch master updated. a8a1ef0a4ba2cecd1bb1a2626ec32d3ddc856dd2

Sylvain Beucler beuc-inria at fusionforge.org
Tue Dec 9 15:08:43 CET 2014


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, master has been updated
       via  a8a1ef0a4ba2cecd1bb1a2626ec32d3ddc856dd2 (commit)
      from  cf59f89e2769f66dfbf7a957080086c4608fb904 (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 a8a1ef0a4ba2cecd1bb1a2626ec32d3ddc856dd2
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Dec 9 15:08:32 2014 +0100

    install: make install-src.sh work when called with a relative path

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 9710fca..8ec45fe 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -49,17 +49,18 @@ else
 	unoconv poppler-utils
 fi
 
-cd $(dirname $0)/../src/
-make
-make install-base install-shell \
-    install-plugin-scmsvn install-plugin-scmgit \
-    install-plugin-blocks install-plugin-mediawiki install-plugin-moinmoin \
-    install-plugin-online_help
-# adapt .ini configuration in /etc/fusionforge/config.ini.d/
-make post-install-base post-install-shell \
-    post-install-plugin-scmsvn post-install-plugin-scmgit \
-    post-install-plugin-blocks post-install-plugin-mediawiki post-install-plugin-moinmoin \
-    post-install-plugin-online_help
+(
+    cd $(dirname $0)/../src/
+    make
+    make install-base install-shell \
+        install-plugin-scmsvn install-plugin-scmgit \
+        install-plugin-blocks install-plugin-mediawiki install-plugin-moinmoin \
+        install-plugin-online_help
+    make post-install-base post-install-shell \
+        post-install-plugin-scmsvn post-install-plugin-scmgit \
+        post-install-plugin-blocks post-install-plugin-mediawiki post-install-plugin-moinmoin \
+        post-install-plugin-online_help
+)
 
 # Dump clean DB
 if [ ! -e /root/dump ]; then $(dirname $0)/../tests/func/db_reload.sh --backup; fi

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

Summary of changes:
 autoinstall/install-src.sh |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list