[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 0412e3a145c09609e9a9e843522ec35e52b64b4b
Franck VILLAUME
nerville at fusionforge.org
Thu Feb 13 17:47:15 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, Branch_5_3 has been updated
via 0412e3a145c09609e9a9e843522ec35e52b64b4b (commit)
from 072d67dda614580c3eaaa3b854fe112d70ed99fa (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 0412e3a145c09609e9a9e843522ec35e52b64b4b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 17:47:10 2014 +0100
install-ng: drop lsb_release
diff --git a/src/install/deps b/src/install/deps
index 623267e..203df17 100755
--- a/src/install/deps
+++ b/src/install/deps
@@ -4,7 +4,7 @@
# Copyright 2006 GForge, LLC
# Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
# Copyright (C) 2011 Christian Bayle
-# Copyright 2013, Franck Villaume - TrivialDev
+# Copyright 2013-2014, Franck Villaume - TrivialDev
# http://fusionforge.org/
#
# @version
@@ -54,10 +54,10 @@ deps_redhat() {
pg=postgresql
esac
case $targetversion in
- 5)
+ 5|el5)
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)
+ 6|el6)
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
diff --git a/src/install/detect_os b/src/install/detect_os
index 63d77c1..ff75650 100755
--- a/src/install/detect_os
+++ b/src/install/detect_os
@@ -99,19 +99,12 @@ detect_type()
detect_version()
{
version=''
- lsb_release_bin=$(which lsb_release)
- ret=`echo $?`
- if [ $ret ]
- then
- os=$(detect_os)
- case $os in
- centos|rhel|redhat_unknown|fedora)
- release=$(rpm -q --queryformat='%{release}' kernel)
- version=${release##*.}
- ;;
- esac
- else
- version=$(lsb_release -rs | cut -f1 -d.)
- fi
+ os=$(detect_os)
+ case $os in
+ centos|rhel|redhat_unknown|fedora)
+ release=$(rpm -q --queryformat='%{release}' kernel)
+ version=${release##*.}
+ ;;
+ esac
echo $version
}
-----------------------------------------------------------------------
Summary of changes:
src/install/deps | 6 +++---
src/install/detect_os | 21 +++++++--------------
2 files changed, 10 insertions(+), 17 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list