From 3d8524a782de11610c100df6110796e8c9ba2f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= <mail@jeromeschneider.fr>
Date: Thu, 22 Mar 2012 14:05:36 +0100
Subject: [PATCH] Better assertions and error messages in Mongoose/run.sh

Former-commit-id: 9da7587d201c608f80d9ec54df0d7f9e664550dd
---
 CoreVersions/Baikal_0.1/Bootstrap.php   |  0
 CoreVersions/Baikal_0.1/Mongoose/run.sh | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 CoreVersions/Baikal_0.1/Bootstrap.php

diff --git a/CoreVersions/Baikal_0.1/Bootstrap.php b/CoreVersions/Baikal_0.1/Bootstrap.php
old mode 100644
new mode 100755
diff --git a/CoreVersions/Baikal_0.1/Mongoose/run.sh b/CoreVersions/Baikal_0.1/Mongoose/run.sh
index 164cead..d45e28f 100755
--- a/CoreVersions/Baikal_0.1/Mongoose/run.sh
+++ b/CoreVersions/Baikal_0.1/Mongoose/run.sh
@@ -30,18 +30,26 @@ function whichBINDIST() {
 }
 
 function getBaikalConf() {
-	local CONF=$(php -r "require_once('$PATH_CONFIGFILE'); if(is_bool($1)) { echo intval($1);} else { echo $1;}")
+	local CONF=$(php -r "require_once('$PATH_CONFIGFILE'); if(!defined(\"$1\")) { echo null; exit;} if(is_bool($1)) { echo intval($1); exit;} else { echo $1; exit;}")
 	echo "$CONF"
 }
 
 BAIKAL_STANDALONE_ALLOWED=$(getBaikalConf BAIKAL_STANDALONE_ALLOWED)
 if [[ "$BAIKAL_STANDALONE_ALLOWED" == '0' ]]; then
-	echo "Baïkal Standalone Server is disabled by config."
-	exit 0
+	echo "Baïkal Standalone Server is disallowed by config. To allow it, please set BAIKAL_STANDALONE_ALLOWED to TRUE in Specific/config.php"
+	echo "-- Aborting; Baïkal Standalone Server is not running --"
+	exit 1
 fi
 
-BAIKAL_STANDALONE_PORT=$(getBaikalConf BAIKAL_STANDALONE_PORT)
 MONGOOSE_BINDIST=$(whichBINDIST)
+BAIKAL_STANDALONE_PORT=$(getBaikalConf BAIKAL_STANDALONE_PORT)
+
+if [[ "$BAIKAL_STANDALONE_PORT" == "" ]]; then
+	echo "No port number is defined for Baïkal Standalone Server to listen on. Please set BAIKAL_STANDALONE_PORT to the desired portnumber in Specific/config.php;"
+	echo "-- Aborting; Baïkal Standalone Server is not running --"
+	exit 1
+fi
+
 echo "Serving standalone Baïkal on port $BAIKAL_STANDALONE_PORT ('$PATH_DOCROOT' on $MONGOOSE_BINDIST)"
 
 MONGOOSE_BIN="$MONGOOSE_BUILDS""$MONGOOSE_BINDIST""/mongoose"