Install script: change directory - post_install_script

1 files changed, 6 insertions, 5 deletions

diff --git a/install/ishtar-install b/install/ishtar-install
index 0d1b6d096..c376e05f2 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -250,7 +250,7 @@ EOF
         fi
     done
 
-    full_install_path=$install_path'/ishtar/'$version
+    full_install_path=$install_path'/ishtar/'
     if [ -d "$full_install_path" ]; then
         echo ""
         echo "ERROR: it seems that "$full_install_path" already exists. If this is a "
@@ -369,8 +369,7 @@ EOF
     echo "Installing Ishtar sources"
     echo "";
 
-    mkdir -p $full_install_path
-    cd $full_install_path
+    cd $install_path
     if [ "$dist_version" == "wheezy" ]; then
         ( set -x; git clone https://nimn@gitlab.com/iggdrasil/oook_replace.git 2> /dev/null )
     fi
@@ -380,7 +379,7 @@ EOF
     git checkout $version 2> /dev/null
 
     mkdir -p $etc_path
-    echo "ISHTAR_PATH="$full_install_path'/ishtar/' > $etc_path"config"
+    echo "ISHTAR_PATH="$full_install_path > $etc_path"config"
     echo "ISHTAR_DB="$default_db >> $etc_path"config"
     echo "ISHTAR_WEBSERVER="$webserver >> $etc_path"config"
     echo "# settings added to all instances" >> $etc_path"extra_settings.py"
@@ -388,7 +387,9 @@ EOF
     echo "*******************************************************************************";
     echo "";
     echo "Installation done. Base configuration stored in "$etc_path"config file."
-    echo "Next you'll have to create an instance."
+    echo "You can edit "$etc_path"extra_settings.py to add settings to all new instances."
+    echo "";
+    echo "Next you'll have to create an instance with ishtar-prepare-instance script."
     echo "";
 
 }