[Fusionforge-commits] FusionForge branch master updated. d4fdc8eb3c38121ed58ff7c8dabb65b419a3c702
Franck VILLAUME
nerville at fusionforge.org
Thu Feb 13 17:34:58 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 d4fdc8eb3c38121ed58ff7c8dabb65b419a3c702 (commit)
via b75b5baaaa3774157527a5c811f16f2f49d1cd02 (commit)
via ca109f426030d7a61a810a75bd21a1206d552332 (commit)
via fee18789ea6c9a0ed5554eff6f9a811a51ebb42b (commit)
from df3a6fbdcce6452681478eecf512de195484c71b (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 d4fdc8eb3c38121ed58ff7c8dabb65b419a3c702
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 17:29:55 2014 +0100
install-ng: really fix syntax
diff --git a/src/install/detect_os b/src/install/detect_os
index dc9eb04..63d77c1 100755
--- a/src/install/detect_os
+++ b/src/install/detect_os
@@ -109,7 +109,7 @@ detect_version()
release=$(rpm -q --queryformat='%{release}' kernel)
version=${release##*.}
;;
- case
+ esac
else
version=$(lsb_release -rs | cut -f1 -d.)
fi
commit b75b5baaaa3774157527a5c811f16f2f49d1cd02
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 16:55:32 2014 +0100
install-ng: fix syntax
diff --git a/src/install/detect_os b/src/install/detect_os
index 524d938..dc9eb04 100755
--- a/src/install/detect_os
+++ b/src/install/detect_os
@@ -109,6 +109,7 @@ detect_version()
release=$(rpm -q --queryformat='%{release}' kernel)
version=${release##*.}
;;
+ case
else
version=$(lsb_release -rs | cut -f1 -d.)
fi
commit ca109f426030d7a61a810a75bd21a1206d552332
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 16:53:30 2014 +0100
install-ng: fix detect_version
diff --git a/src/install/detect_os b/src/install/detect_os
index 6c62522..524d938 100755
--- a/src/install/detect_os
+++ b/src/install/detect_os
@@ -3,7 +3,7 @@
# Simple OS detection script
#
# Currently supported:
-# * Red Hat 5 / CentOS 5
+# * Red Hat 5,6 / CentOS 5,6
# * Fedora
# * OpenSuSE 11
#
@@ -98,6 +98,19 @@ detect_type()
detect_version()
{
- version=$(lsb_release -rs | cut -f1 -d.)
+ 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##*.}
+ ;;
+ else
+ version=$(lsb_release -rs | cut -f1 -d.)
+ fi
echo $version
}
commit fee18789ea6c9a0ed5554eff6f9a811a51ebb42b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 17:17:59 2014 +0100
install-ng: fix install3 exit on error
diff --git a/src/install/install3 b/src/install/install3
index 2d7ccc3..89097b9 100755
--- a/src/install/install3
+++ b/src/install/install3
@@ -305,7 +305,7 @@ EOF
msg green " * Running php db/upgrade-db.php"
if ! php $fusionforge_src_dir/db/upgrade-db.php >> /tmp/gforge-upgrade.log ; then
msg red "upgrade-db.php failed."
- return 1
+ exit 1
fi
if [ -z "$FFORGE_ADMIN_USER" ]
-----------------------------------------------------------------------
Summary of changes:
src/install/detect_os | 18 ++++++++++++++++--
src/install/install3 | 2 +-
2 files changed, 17 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list