projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugs fixed in scripts related to database init and migrate
[osm/RO.git]
/
scripts
/
install-openmano.sh
diff --git
a/scripts/install-openmano.sh
b/scripts/install-openmano.sh
index
9a2e725
..
3849bd7
100755
(executable)
--- a/
scripts/install-openmano.sh
+++ b/
scripts/install-openmano.sh
@@
-257,7
+257,7
@@
echo '
#################################################################'
echo -e "\nCreating temporary file form MYSQL installation and initialization"
TEMPFILE="$(mktemp -q --tmpdir "installopenmano.XXXXXX")"
#################################################################'
echo -e "\nCreating temporary file form MYSQL installation and initialization"
TEMPFILE="$(mktemp -q --tmpdir "installopenmano.XXXXXX")"
-trap 'rm -f "$TEMPFILE"' EXIT
+trap 'rm -f "$TEMPFILE"' EXIT
SIGINT SIGTERM
chmod 0600 "$TEMPFILE"
cat >"$TEMPFILE" <<EOF
[client]
chmod 0600 "$TEMPFILE"
cat >"$TEMPFILE" <<EOF
[client]
@@
-289,12
+289,19
@@
else
fi
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 #####
#################################################################'
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
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