Merge "Fixes bug #57"

[osm/RO.git] / scripts / install-openmano.sh

diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index 48e2a81..4a2ff72 100755 (executable)
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -265,9 +265,7 @@ user=$DBUSER
 password=$DBPASSWD
 EOF
 
-db_exists "mano_db" $TEMPFILE
-DBEXISTS=$?
-if [[ $DBEXISTS -eq 0 ]] ; then
+if db_exists "mano_db" $TEMPFILE ; then
     if [[ -n $FORCEDB ]]; then
         echo "   Deleting previous database mano_db"
         DBDELETEPARAM=""
@@ -284,19 +282,26 @@ if [[ $DBEXISTS -eq 0 ]] ; then
         echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1
     fi
 else
-    mysqladmin -u$DBUSER $DBPASSWD_PARAM -s create mano_db || ( echo "Error creating mano_db database" && exit 1 )
+    mysqladmin -u$DBUSER $DBPASSWD_PARAM -s create mano_db || ! echo "Error creating mano_db database" || exit 1 
     echo "CREATE USER 'mano'@'localhost' identified by 'manopw';"   | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
     echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
     echo " Database 'mano_db' created, user 'mano' password 'manopw'"
 fi
 
 
+#Next operations require knowing OPENMANO_BASEFOLDER
+HERE=$(realpath $(dirname $0))
+if [[ -z $NOCLONE ]]; then
+    OPENMANO_BASEFOLDER="${HERE}/openmano"
+else
+    OPENMANO_BASEFOLDER=$(dirname $HERE)
+fi
+
+
 echo '
 #################################################################
 #####        INIT DATABASE                                  #####
 #################################################################'
-HERE=$(realpath $(dirname $0))
-OPENMANO_BASEFOLDER=$(dirname $HERE)
 su $SUDO_USER -c "${OPENMANO_BASEFOLDER}"'/database_utils/init_mano_db.sh -u mano -p manopw -d mano_db' || ! echo "Failed while initializing database" || exit 1