From: Tim Otten <to-git@think.hm>
Date: Sun, 3 Mar 2013 04:04:10 +0000 (-0500)
Subject: Display informative warning if setup.conf is missing.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ea16a8235f82f5b28e2bc97b694d6dafaf412cab;p=civicrm-core.git

Display informative warning if setup.conf is missing.
---

diff --git a/bin/setup.sh b/bin/setup.sh
index aeb8f8f229..0db06e1665 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -9,6 +9,12 @@ case "$CALLEDPATH" in
     ;;
 esac
 
+if [ ! -f "$CALLEDPATH/setup.conf" ]; then
+  echo
+  echo "Missing configuration file. Please copy $CALLEDPATH/setup.conf.txt to $CALLEDPATH/setup.conf and edit it."
+  exit 1
+fi
+
 source "$CALLEDPATH/setup.conf"
 
 if [ "$1" = '-h' ] || [ "$1" = '--help' ]; then