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

Commit 4d789c90 authored by Philippe Gauron's avatar Philippe Gauron
Browse files

Merge branch 'verification-environnement' into 'master'

typos, exécution à partir de tout dossier, verif install client

See merge request CCThomX/installation!20
parents 02ef1460 3e13bb9f
......@@ -11,7 +11,9 @@ set +e
## Set to 1 to print every message
DEBUG=1
REPO_DIR=$(pwd)/$(dirname "$0")
cd $(dirname "$0")
REPO_DIR=$(pwd)/
## Getting printing functions
source "${REPO_DIR}/utils.sh"
......@@ -25,12 +27,13 @@ source "${REPO_DIR}/installation_parameters.sh"
if [[ "${DEBUG}" -eq 1 ]]
then
info "Installation settings"
echo "DOWNLOAD_ONLY=$DOWNLOAD_ONLY"
echo "DEPENDENCIES=$DEPENDENCIES"
echo "DATABASE=$DATABASE"
echo "TANGO=$TANGO"
echo "TANGO_DB=$TANGO_DB"
echo "ARCHIVING=$ARCHIVING"
echo "DOWNLOAD_ONLY=${DOWNLOAD_ONLY}"
echo "DEPENDENCIES=${DEPENDENCIES}"
echo "DATABASE=${DATABASE}"
echo "TANGO=${TANGO}"
echo "CLIENT=${CLIENT}"
echo "TANGO_DB=${TANGO_DB}"
echo "ARCHIVING=${ARCHIVING}"
echo
fi
......@@ -48,6 +51,14 @@ then
fi
## CLIENT=1 -> TANGO=1
if [ "${DEPENDENCIES}" == "1" ] && [ "${CLIENT}" -eq "1" ]
then
warning "installation of CLIENT asked, TANGO will be considered set."
TANGO=1
fi
## TANGO_DB=1 -> TANGO=1 & DATABASE=1
if [ "${DEPENDENCIES}" == "1" ] && [ "${TANGO_DB}" -eq "1" ]
then
......@@ -94,7 +105,7 @@ PIP_PACKAGES_VERSION=(
DEBIAN_PACKAGES="python-qt4 python-qwt5-qt4 python-qtpy qt4-designer pyqt4-dev-tools"
## test
#DEBIAN_PACKAGES="test python-qt4 python-qwt5-qt4 python-qtpy qt4-designer pyqt4-dev-tools"
DEBIAN_PACKAGES_CLIENT="libx32gcc-6-dev libgl1-mesa-dev:i386 libxinerama1:i386 libgl1-nvidia-glx:i386" # " xfonts-75dpi-transcoded xfonts-100dpi-transcoded"
......@@ -107,8 +118,8 @@ DEBIAN_PACKAGES="python-qt4 python-qwt5-qt4 python-qtpy qt4-designer pyqt4-dev-t
## DATABASE
if [[ "${DATABASE}" -eq 1 ]]
then
OUTPUT_DBSERVER=$(dpkg -s mariadb-server | grep Status)
if [[ "${OUTPUT_DBSERVER}" == "Status: install ok installed" ]]
OUTPUT_DPKG=$(dpkg -s mariadb-server | grep Status)
if [[ "${OUTPUT_DPKG}" == "Status: install ok installed" ]]
then
if [[ "${DEBUG}" -eq 1 ]]
then
......@@ -120,8 +131,8 @@ then
DBSERVER_INSTALLED=0
fi
OUTPUT_DBCLIENT=$(dpkg -s mariadb-client | grep Status)
if [ "${OUTPUT_DBCLIENT}" == "Status: install ok installed" ]
OUTPUT_DPKG=$(dpkg -s mariadb-client | grep Status)
if [ "${OUTPUT_DPKG}" == "Status: install ok installed" ]
then
if [[ "${DEBUG}" -eq 1 ]]
then
......@@ -244,12 +255,60 @@ then
fi
### CLIENT
if [[ "${CLIENT}" -eq 1 ]]
then
### libzmq libraries (temporary)
if [[ -d /data/shared/lib/ ]] \
&& [[ -e /data/shared/lib/libzmq.so ]] \
&& [[ -e /data/shared/lib/libzmq.so.5 ]] \
&& [[ -e /data/shared/lib/libzmq.so.5.2.1 ]]
then
if [[ "${DEBUG}" -eq 1 ]]
then
info "local (temporary) libzmq successfully installed"
fi
else
warning "local (temporary) libzmq installation failed!"
fi
### labview libraries
if [[ -d /data/shared/lib/ ]] \
&& [[ -d /data/shared/lib/labview ]] \
&& [[ -d /data/shared/lib/labview/LabVIEW-2014 ]] \
&& [[ -d /data/shared/lib/labview/runtime ]]
then
if [[ "${DEBUG}" -eq 1 ]]
then
info "local LabView libraries successfully installed"
fi
else
warning "local LabView libraries installation failed!"
fi
## Checking debian packages installation
for package in ${DEBIAN_PACKAGES_CLIENT}
do
DEBIAN_PACKAGE_NOT_INSTALLED=1
$(dpkg -l | grep ^ii | grep "${package} " > /dev/null) && DEBIAN_PACKAGE_NOT_INSTALLED=0
if [[ "$?" -ne 0 ]]
then
warning "debian package ${package} is not installed"
else
if [[ "${DEBUG}" -eq 1 ]]
then
info "debian package ${package} is installed"
fi
fi
done
fi
### TANGO_HOST
source /etc/tangorc
if [[ "${TANGO_HOST}" == "${CORRECT_TANGO_HOST}" ]]
then
if [[ "${DEBUG}" -eq 1 ]]
if [[ "${DEBUG}" -eq 1 ]]
then
info "TANGO_HOST correctly set to ${TANGO_HOST}"
fi
......@@ -304,7 +363,7 @@ do
done
## Checking debian packages installation
for package in ${DEBIAN_PACKAGES}
for package in ${DEBIAN_PACKAGES_CLIENT}
do
DEBIAN_PACKAGE_NOT_INSTALLED=1
$(dpkg -l | grep ^ii | grep "${package} " > /dev/null) && DEBIAN_PACKAGE_NOT_INSTALLED=0
......@@ -317,7 +376,6 @@ do
info "debian package ${package} is installed"
fi
fi
done
## matlab : check that matlab is 2018b version
......@@ -348,8 +406,8 @@ echo "-----"
# atkpanel
echo
info "La fenêtre qui s'affiche doit avoir un statut vert"
echo "Starting sys/database/2 ATKPanel"
atkpanel sys/database/2
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