Fix to issues with the install script

- no more relative jumps in the script
- moved the cakephp include directory to fix background worker issues

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "app/Plugin/CakeResque"]
 	path = app/Plugin/CakeResque
 	url = git://github.com/kamisama/Cake-Resque.git
-[submodule "Lib/cakephp"]
-	path = Lib/cakephp
+[submodule "app/Lib/cakephp"]
+	path = app/Lib/cakephp
 	url = https://github.com/cakephp/cakephp.git

INSTALL/INSTALL.SH

@@ -1,3 +1,7 @@
+dir=`dirname $0`
+FILE_PATH=`cd  $dir;pwd`
+cd ..
+MISP_PATH=`pwd`
 clear
 printf '=========================================================\n'
 printf '|                                                       |\n'
@@ -29,18 +33,18 @@ fi
 pear install Crypt_GPG
 pear install Net_GeoIP
 git config core.filemode false
-cd ..
+cd $(echo $MISP_PATH)
 git submodule init
 git submodule update
-cd app/Plugin/CakeResque
+cd $(echo $MISP_PATH)/app/Plugin/CakeResque
 curl -s https://getcomposer.org/installer | php
 php composer.phar install
-cd ../../..
-chown -R www-data:www-data *
-chmod -R 750 *
-chmod -R g+ws app/tmp
-chmod -R g+ws app/files
-cp -fa INSTALL/setup/config.php app/Plugin/CakeResque/Config/config.php
+cd $(echo $MISP_PATH)
+chown -R www-data:www-data $(echo $MISP_PATH)
+chmod -R 750 $(echo $MISP_PATH)
+chmod -R g+ws $(echo $MISP_PATH)/app/tmp
+chmod -R g+ws $(echo $MISP_PATH)/app/files
+cp -fa FILE_PATH/setup/config.php $(echo $MISP_PATH)/app/Plugin/CakeResque/Config/config.php
 printf '\n\n=========================================================\n'
 printf '|               \e[34mI\e[39mnstallation \e[34mC\e[39momplete                   |\n'
 printf '=========================================================\n\n'

INSTALL/UPGRADE.SH

@@ -1,4 +1,7 @@
-clear
+dir=`dirname $0`
+FILE_PATH=`cd  $dir;pwd`
+cd ..
+MISP_PATH=`pwd`
 printf '========================================================\n'
 printf '|                                                      |\n'
 printf '|         \e[34mM\e[39malware \e[34mI\e[39mnformation \e[34mS\e[39mharing \e[34mP\e[39mlatform         |\n'
@@ -21,10 +24,9 @@ then
 else
 	printf '\n\nDatabase not updated. You will have to update it manually by executing\n\nmysql -u [username] -p[password] [database name] < upgrade_2.2.sql from the MISP/INSTALL directory\n\n'
 fi
-cd ..
+cd $(echo $MISP_PATH)
 git submodule init
 git submodule update
-cd app/Plugin/CakeResque
 
 YUM_CMD=$(which yum)
 APT_GET_CMD=$(which apt-get)
@@ -46,14 +48,15 @@ else
 	echo "Error, you need either apt-get, yum or brew to install Redis using this script. Please install it manually.";
 fi
 
+cd $(echo $MISP_PATH)/app/Plugin/CakeResque
 curl -s https://getcomposer.org/installer | php
 php composer.phar install
-cd ../../..
-chown -R www-data:www-data *
-chmod -R 750 *
-chmod -R g+ws app/tmp
-chmod -R g+ws app/files
-cp -fa INSTALL/setup/config.php app/Plugin/CakeResque/Config/config.php
+cd $(echo $MISP_PATH)
+chown -R www-data:www-data $(echo $MISP_PATH)
+chmod -R 750 $(echo $MISP_PATH)
+chmod -R g+ws $(echo $MISP_PATH)/app/tmp
+chmod -R g+ws $(echo $MISP_PATH)/app/files
+cp -fa $(echo $FILE_PATH)/setup/config.php $MISP_PATH/app/Plugin/CakeResque/Config/config.php
 printf '\n\n=========================================================\n'
 printf '|               \e[34mI\e[39mnstallation \e[34mC\e[39momplete                   |\n'
 printf '=========================================================\n\n'

Lib/cakephp

@@ -1 +0,0 @@
-Subproject commit 96048f401ab20d30e25a16d8c189a9ea0c3ec388

app/Console/cake.php

@@ -18,8 +18,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 $ds = DIRECTORY_SEPARATOR;
-$dispatcher = dirname(dirname(__DIR__)) . $ds . 'Lib' . $ds . 'cakephp' . $ds . 'lib' . $ds . 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
-
+$dispatcher = dirname(__DIR__) . $ds . 'Lib' . $ds . 'cakephp' . $ds . 'lib' . $ds . 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
 	ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));

app/Lib/cakephp

@@ -0,0 +1 @@
+Subproject commit ac1a5c58f5654d6a1850fe57f9f893f187c0eba4

app/webroot/index.php

@@ -56,7 +56,7 @@ if (!defined('APP_DIR')) {
  *
  * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
  */
-	define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'Lib' . DS . 'cakephp' . DS . 'lib');
+	define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . APP_DIR . DS .'Lib' . DS . 'cakephp' . DS . 'lib');
 
 /**
  * Editing below this line should NOT be necessary.