[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 6a821bdc6cb029cad5ace0a9e71a03916a0fad4f

Sylvain B beuc at fusionforge.org
Sun Apr 13 22:02:00 CEST 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, Branch_5_3 has been updated
       via  6a821bdc6cb029cad5ace0a9e71a03916a0fad4f (commit)
      from  82da7072aea05e7c93552f185d60703be72a21b6 (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 6a821bdc6cb029cad5ace0a9e71a03916a0fad4f
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Apr 13 22:01:52 2014 +0200

    VM: simplify install script

diff --git a/vm/scripts/install.sh b/vm/scripts/install.sh
index db085ac..8800d95 100755
--- a/vm/scripts/install.sh
+++ b/vm/scripts/install.sh
@@ -12,15 +12,10 @@
 
 
 #set -x
-grep -q debian-repository /etc/apt/sources.list /etc/apt/sources.list.d/*
-if [ $? -ne 0 ]; then
-    echo "You probably need to add the following in /etc/apt/sources.list :"
-    echo "echo 'deb file:///usr/src/debian-repository local/' >> /etc/apt/sources.list"
-    exit 1
-fi
-
 set -e
 
+variant=${1:-full}
+
 # "Backport" recent dependency
 if ! dpkg -l loggerhead | grep -q ^ii ; then
     wget -c http://snapshot.debian.org/archive/debian/20121107T152130Z/pool/main/l/loggerhead/loggerhead_1.19%7Ebzr477-1_all.deb
@@ -31,15 +26,12 @@ fi
 aptitude update
 if dpkg -l fusionforge-full | grep -q ^ii ; then
     # Already installed, upgrading
-    /usr/src/fusionforge/tests/func/db_reload.sh
     UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y dist-upgrade
 else
     # Initial installation
-    UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install gforge-db-postgresql
-    UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install fusionforge-full
+    UCF_FORCE_CONFFNEW=yes LANG=C DEBIAN_FRONTEND=noninteractive aptitude -y install fusionforge-$variant
     /usr/share/gforge/bin/forge_set_password admin myadmin
     a2dissite default
     invoke-rc.d apache2 restart
     su - postgres -c "pg_dumpall" > /root/dump
-    echo "If you saw a message like 'Could not connect to database' above, don't worry, it's probably harmless."
 fi

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

Summary of changes:
 vm/scripts/install.sh |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list