[Fusionforge-commits] FusionForge branch master updated. 24a7e4105850bb2aa71566603b3b8a79405661d8

Franck VILLAUME nerville at fusionforge.org
Thu Feb 13 15:50:34 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  24a7e4105850bb2aa71566603b3b8a79405661d8 (commit)
       via  9a9f32b23654fafe21a59e81b564b0a22cf8bf26 (commit)
      from  238e316068a46672ac1e7a9bf5d0fd99df08f8ff (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 24a7e4105850bb2aa71566603b3b8a79405661d8
Merge: 9a9f32b 238e316
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Feb 13 15:49:51 2014 +0100

    Merge branch 'master' of git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge


commit 9a9f32b23654fafe21a59e81b564b0a22cf8bf26
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Feb 13 15:47:26 2014 +0100

    install-ng: start to handle RHEL6 correctly. No hardcoded version

diff --git a/src/install-ng b/src/install-ng
index b4eae60..a462656 100755
--- a/src/install-ng
+++ b/src/install-ng
@@ -14,6 +14,8 @@
 # Author: Alain Peyrat <aljeux at free.fr>
 #         Christian Bayle <bayle at debian.org>
 #
+# Copyright 2014, Franck Villaume - TrivialDev
+#
 FORGE_HOME=/opt/gforge
 
 usage(){
@@ -84,6 +86,7 @@ fusionforge_etc_dir=${FUSIONFORGE_ETC_DIR:-/etc/gforge}
 # Call to detect_os, this will set $type and $distrib
 os=$(detect_os)
 type=$(detect_type)
+targetversion=$(detect_version)
 echo "Install type = $type"
 
 if $DEPS || $DEFAULT
diff --git a/src/install/deps b/src/install/deps
index 893db2d..623267e 100755
--- a/src/install/deps
+++ b/src/install/deps
@@ -53,7 +53,15 @@ deps_redhat() {
 		    *)
 			pg=postgresql
 		esac
-		yum --enablerepo=fusionforge --enablerepo=dag-rpmforge -y --skip-broken install httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pecl-zip php-pear-HTTP_WebDAV_Server antiword php-pecl-Fileinfo shared-mime-info rsync git gitweb
+		case $targetversion in
+			5)
+				packagelist="httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pecl-zip php-pear-HTTP_WebDAV_Server antiword php-pecl-Fileinfo shared-mime-info rsync git gitweb"
+				;;
+			6)
+				packagelist="httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pear-HTTP_WebDAV_Server antiword shared-mime-info rsync git gitweb"
+				;;
+		esac
+		yum --enablerepo=fusionforge --enablerepo=dag-rpmforge -y --skip-broken install $packagelist
 		touch /tmp/done_yum
 	fi
 }
@@ -137,7 +145,7 @@ addFusionForgeYumRepo() {
 		msg green "Adding Fusionforge YUM repository"
 		if [ -z "$FFORGE_RPM_REPO" ]
 		then 
-			rpm_repo="http://fusionforge.fusionforge.org/rpm/5.1"
+			rpm_repo="http://fusionforge.fusionforge.org/rpm/5.3"
 		else
 			rpm_repo="$FFORGE_RPM_REPO"
 		fi
@@ -165,12 +173,11 @@ addDagRPMForgeYumRepo() {
 			rpm_repo="$DAG_RPMFORGE_REPO"
 		fi
 		cat > /etc/yum.repos.d/dag-rpmforge.repo <<-END
-# Name: RPMforge RPM Repository for Red Hat Enterprise 5 - dag
+# Name: RPMforge RPM Repository for Red Hat Enterprise \$releasever - dag
 # URL: http://rpmforge.net/
 [dag-rpmforge]
-name = Red Hat Enterprise \$releasever - RPMforge.net - dag
-baseurl = $rpm_repo/el5/en/\$basearch/dag
-#mirrorlist = http://apt.sw.be/redhat/el5/en/mirrors-rpmforge
+name = Red Hat Enterprise $targetversion - RPMforge.net - dag
+baseurl = $rpm_repo/el$targetversion/en/\$basearch/dag
 enabled = 0
 protect = 0
 gpgcheck = 0
diff --git a/src/install/detect_os b/src/install/detect_os
index 817016b..6c62522 100755
--- a/src/install/detect_os
+++ b/src/install/detect_os
@@ -10,6 +10,8 @@
 # Authors: Christian Bayle <bayle at debian.org>
 #          Alain Peyrat <aljeux at free.fr>
 #
+# Copyright 2014, Franck Villaume - TrivialDev
+#
 # FusionForge is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -94,4 +96,8 @@ detect_type()
 	echo $type
 }
 
-
+detect_version()
+{
+	version=$(lsb_release -rs | cut -f1 -d.)
+	echo $version
+}

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

Summary of changes:
 src/install-ng        |    3 +++
 src/install/deps      |   19 +++++++++++++------
 src/install/detect_os |    8 +++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list