Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
commit
0d38d9ecaa
|
@ -69,7 +69,7 @@ if [ "$DB_DISABLE_INCLUDED" = "false" ]; then
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "Create database schema if it does not exists ..."
|
echo "Create database schema if it does not exists ..."
|
||||||
mysql -u "$DB_USER" -h "$DB_HOST" -p"$DB_PASSWORD" --port="$DB_PORT" -e "source /home/Shinobi/sql/framework.sql" || true
|
mysql -u "$DB_USER" -h "$DB_HOST" -p"$DB_PASSWORD" --port="$DB_PORT" --database="$DB_DATABASE" -e "source /home/Shinobi/sql/framework.sql" || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DATABASE_CONFIG='{"host": "'$DB_HOST'","user": "'$DB_USER'","password": "'$DB_PASSWORD'","database": "'$DB_DATABASE'","port":'$DB_PORT'}'
|
DATABASE_CONFIG='{"host": "'$DB_HOST'","user": "'$DB_USER'","password": "'$DB_PASSWORD'","database": "'$DB_DATABASE'","port":'$DB_PORT'}'
|
||||||
|
|
|
@ -80,7 +80,7 @@ if [[ $@ == *'restart'* ]]; then
|
||||||
else
|
else
|
||||||
if [[ $@ == *'start'* ]] || [[ $@ == *'now'* ]]; then
|
if [[ $@ == *'start'* ]] || [[ $@ == *'now'* ]]; then
|
||||||
proccessAlive=$(pm2 list | grep camera | grep online)
|
proccessAlive=$(pm2 list | grep camera | grep online)
|
||||||
if [ "$proccessAlive" ]]; then
|
if [ "$proccessAlive" ]; then
|
||||||
echo "Shinobi process is already running."
|
echo "Shinobi process is already running."
|
||||||
else
|
else
|
||||||
if [ -e "$installationDirectory/INSTALL/installed.txt" ]; then
|
if [ -e "$installationDirectory/INSTALL/installed.txt" ]; then
|
||||||
|
|
Loading…
Reference in New Issue