diff --git a/tools/itango/install_requirements-DS.sh b/tools/itango/install_requirements-DS.sh deleted file mode 100755 index c5fb3851b91c4f26c5ec6fb7090784dad8fdd722..0000000000000000000000000000000000000000 --- a/tools/itango/install_requirements-DS.sh +++ /dev/null @@ -1,20 +0,0 @@ -if [ ${#} -ne 1 ]; then - echo "The 1st parameter must be the requirements.txt file." - exit -1 -fi - -# Find the path to the device server's requirements.txt file -# on the Docker's host but relative to the /hosthome directory -# in Docker the user's # mounted ${HOME}). -# ATTENTION -# This is assuming that the device server's requirements.txt file -# exists # on the Docker's host in the user's ${HOME} directory. -requirements=$(basename ${1}) -echo ${requirements} -if [ -f ${requirements} ]; then - myDir=${PWD} -else - myDir=${PWD}/$(dirname ${1}) -fi -requirementsPath=${myDir//${HOME}\//\/hosthome\/} -docker exec -it itango python3 -m pip install -r ${requirementsPath}/${requirements} diff --git a/tools/itango/itango_console-requirements.txt b/tools/itango/itango_console-requirements.txt deleted file mode 100644 index 608b6af591fb505776a65e86f1985874a36c6cbf..0000000000000000000000000000000000000000 --- a/tools/itango/itango_console-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -opcua >= 0.98.9 -astropy diff --git a/tools/itango/itango_console.sh b/tools/itango/itango_console.sh index 5f5686138083b7c0de1e7d594c3cad25aa50457a..fb4c9b8a285adca3211633fb89e6e9e59bd01087 100755 --- a/tools/itango/itango_console.sh +++ b/tools/itango/itango_console.sh @@ -1,20 +1,2 @@ -# Find the path to this file that is relative to the -# /hosthome directory (in Docker the user's mounted ${HOME}). -# ATTENTION -# This is assuming that the this file exists -# on the Docker's host in the user's ${HOME} directory. -runThis=$(basename ${0}) -if [ -f ${runThis} ]; then - myDir=${PWD} -else - myDir=${PWD}/$(dirname ${0}) -fi -requirements=${runThis%%.sh}-requirements.txt -thisScriptPath=${myDir/${HOME}/\/hosthome} -if [ -f ${myDir}/${requirements} ]; then - echo "Installing required Python modules with pip3..." - docker exec -it itango pip3 install -r ${thisScriptPath}/${requirements} - echo "Installing required Python modules with pip3 done." -fi - -docker exec -it itango itango3 +#!/bin/bash +exec docker exec -it itango itango3 diff --git a/tools/itango/itango_shell.sh b/tools/itango/itango_shell.sh index cf1495766b11934f3b27616e2d4c5a32cf2441b8..abab9ef8515fd5ce1a1bf2d6d452a538426a499a 100755 --- a/tools/itango/itango_shell.sh +++ b/tools/itango/itango_shell.sh @@ -1 +1,2 @@ -docker exec -it itango /bin/bash +#!/bin/bash +exec docker exec -it itango /bin/bash diff --git a/tools/itango/start-DS.sh b/tools/itango/start-DS.sh index 90ea2e4657249781af2d098a2adacf5da259b1e5..c6b32eccf9bb6db5ea0d327f9d8d9d54a670a8ba 100755 --- a/tools/itango/start-DS.sh +++ b/tools/itango/start-DS.sh @@ -36,11 +36,5 @@ if [ -f ${runThis} ]; then else myDir=${PWD}/$(dirname ${deviceServer}) fi -deviceServerPath=${myDir/${HOME}/\/hosthome} -if [ -f ${myDir}/requirements.txt ]; then - echo "Installing required Python modules with pip3..." - docker exec -it itango pip3 install -r ${deviceServerPath}/requirements.txt - echo "Installing required Python modules with pip3 done." -fi docker exec -it itango python3 ${deviceServerPath}/${runThis} ${instance} ${@}