Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master

don't silently exit in cli-mode in case ownCloud in not yet installed

lib/base.php

@@ -211,9 +211,11 @@ class OC {
 	public static function checkInstalled() {
 		// Redirect to installer if not installed
 		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
-			if (!OC::$CLI) {
+			if (OC::$CLI) {
+				throw new Exception('Not installed');
+			} else {
 				$url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
-				header("Location: $url");
+				header('Location: ' . $url);
 			}
 			exit();
 		}
@@ -520,10 +522,10 @@ class OC {
 
 		self::initTemplateEngine();
 		OC_App::loadApps(array('session'));
-		if (!self::$CLI) {
-			self::initSession();
-		} else {
+		if (self::$CLI) {
 			self::$session = new \OC\Session\Memory('');
+		} else {
+			self::initSession();
 		}
 		self::checkConfig();
 		self::checkInstalled();
@@ -654,8 +656,8 @@ class OC {
 		if (!OC::$CLI
 			// overwritehost is always trusted
 			&& OC_Request::getOverwriteHost() === null
-			&& !OC_Request::isTrustedDomain($host)) {
-
+			&& !OC_Request::isTrustedDomain($host)
+		) {
 			header('HTTP/1.1 400 Bad Request');
 			header('Status: 400 Bad Request');
 			OC_Template::printErrorPage(