Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit ef15c0cf authored by Philippe Gauron's avatar Philippe Gauron
Browse files

Syntaxe bash et développement affichage si TANGO_DB

parent 7fc6b9f7
......@@ -199,7 +199,7 @@ info "server will be installed with TANGOSERVER '${TANGOSERVER}'"
### Checking and correcting of initial configuration
## ${SERVERNAME} == ${TANGOSERVER} -> TANGO-DB=1
if [ "${DEPENDENCIES}" == "1" ] \
if [ "${DEPENDENCIES}" -eq "1" ] \
&& [ "${SERVERNAME}" == "${TANGOSERVER}" ] \
&& [ "${TANGO_DB}" -eq "0" ]
then
......@@ -208,7 +208,7 @@ then
fi
## ARCHIVING=1 -> DATABASE=1
if [ "${DEPENDENCIES}" == "1" ] && [ "${DATABASE}" -eq "0" ] && [ "${ARCHIVING}" -eq "1" ]
if [ "${DEPENDENCIES}" -eq "1" ] && [ "${DATABASE}" -eq "0" ] && [ "${ARCHIVING}" -eq "1" ]
then
warning "installation of ARCHIVING asked, DATABASE will be installed."
DATABASE=1
......@@ -216,11 +216,18 @@ fi
## TANGO_DB=1 -> TANGO=1 & DATABASE=1
if [ "${DEPENDENCIES}" == "1" ] && [ "${TANGO_DB}" -eq "1" ]
if [ "${DEPENDENCIES}" -eq "1" ] && [ "${TANGO_DB}" -eq "1" ]
then
##warning "installation of TANGO_DB asked, TANGO will be installed."
TANGO=1
DATABASE=1
if [ "${TANGO}" -eq "0" ]
then
warning "installation of TANGO_DB asked, TANGO will be installed."
TANGO=1
fi
if [ "${DATABASE}" -eq "0" ]
then
warning "installation of TANGO_DB asked, DATABASE will be installed."
DATABASE=1
fi
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment