Skip to content
Snippets Groups Projects
Commit 1f2b26ef authored by Thomas Juerges's avatar Thomas Juerges
Browse files

L2SS-218 Following Jan David's advice to just use sub-shells instead of pushd/popd

parent a9202168
No related branches found
No related tags found
1 merge request!33Resolve L2SS-218 "Move existing tooling to bootstrap dir"
...@@ -15,14 +15,12 @@ trap ' exit ${?} ' ABRT EXIT HUP INT TERM QUIT ERR ...@@ -15,14 +15,12 @@ trap ' exit ${?} ' ABRT EXIT HUP INT TERM QUIT ERR
function pull_images() function pull_images()
{ {
pushd ${HOME_DIR}/docker-compose && make pull (cd ${HOME_DIR}/docker-compose && make pull)
popd
} }
function build_lofar_images() function build_lofar_images()
{ {
pushd ${HOME_DIR}/docker-compose && make build (cd ${HOME_DIR}/docker-compose && make build)
popd
} }
function move_tango_dir_out_of_the_way() function move_tango_dir_out_of_the_way()
...@@ -48,23 +46,21 @@ function clean_images() ...@@ -48,23 +46,21 @@ function clean_images()
# has already been shut down. # has already been shut down.
# Therefore disable Bash's exit on error flag # Therefore disable Bash's exit on error flag
set +e set +e
pushd ${HOME_DIR}/docker-compose && make clean (cd ${HOME_DIR}/docker-compose && make clean)
popd
# And enable it again. # And enable it again.
set -e set -e
} }
function start_minimal_tango() function start_minimal_tango()
{ {
pushd ${HOME_DIR}/docker-compose (cd ${HOME_DIR}/docker-compose
make minimal make minimal
make start dsconfig make start dsconfig
# Just for good measure, wait a moment and start dsconfig again # Just for good measure, wait a moment and start dsconfig again
echo -e "\tWaiting for dsconfig to settle down..." echo -e "\tWaiting for dsconfig to settle down..."
sleep 10 sleep 10
echo -e "\tDone.\n\tStarting dsconfig again." echo -e "\tDone.\n\tStarting dsconfig again."
make start dsconfig make start dsconfig)
popd
} }
function configure_tango_db() function configure_tango_db()
...@@ -77,23 +73,20 @@ function configure_tango_db() ...@@ -77,23 +73,20 @@ function configure_tango_db()
function configure_elk() function configure_elk()
{ {
pushd ${HOME_DIR}/docker-compose && make start elk-configure-host (cd ${HOME_DIR}/docker-compose && make start elk-configure-host)
popd
} }
function start_support_images() function start_support_images()
{ {
pushd ${HOME_DIR}/docker-compose && make start elk (cd ${HOME_DIR}/docker-compose && make start elk
make start jupyter make start jupyter)
popd
} }
function start_lofar_images() function start_lofar_images()
{ {
pushd ${HOME_DIR}/docker-compose (cd ${HOME_DIR}/docker-compose
make start device-pcc make start device-pcc
make start device-sdp make start device-sdp)
popd
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment