From 6222e56ee4b9a92e3f0abeaf4177c684ce0fccef Mon Sep 17 00:00:00 2001
From: David <david@nedved.com.au>
Date: Sun, 16 Sep 2018 22:13:30 +1000
Subject: [PATCH] add defaults for no-postgres and no-rabbitmq options
---
install | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/install b/install
index d918a1420..8cab1edaa 100755
--- a/install
+++ b/install
@@ -91,6 +91,8 @@ upgrade="f"
dist=""
code=""
apache_bin=""
+skip_postgres=0
+skip_rabbitmq=0
function verbose() {
@@ -455,10 +457,10 @@ while :; do
--selinux)
selinux="t"
;;
- --skip-postgres)
+ --no-postgres)
skip_postgres=1
;;
- --skip-rabbitmq)
+ --no-rabbitmq)
skip_rabbitmq=1
;;
--)
@@ -998,7 +1000,7 @@ else
loudCmd "a2enmod rewrite php5"
fi
-if [ $skip_postgres -ne 1 ]; then
+if [ $skip_postgres -eq 0 ]; then
loud "\n-----------------------------------------------------"
loud " * Configuring PostgreSQL * "
loud "-----------------------------------------------------"
@@ -1035,7 +1037,7 @@ EOF
fi
fi
-if [ $skip_rabbitmq -ne 1 ]; then
+if [ $skip_rabbitmq -eq 0 ]; then
loud "\n-----------------------------------------------------"
loud " * Configuring RabbitMQ * "