diff --git a/bcli-develop.sh b/bcli-develop.sh index 457b44d..94dd064 100644 --- a/bcli-develop.sh +++ b/bcli-develop.sh @@ -1,40 +1,41 @@ bcli() { - if [ "$1" = "up" ]; then - docker run -d -v $HOME:/host --rm --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" public.ecr.aws/l5h5o6z4/broccoli-cli:latest > /dev/null - echo "bcli-develop started" - elif [ "$1" = "down" ]; then - docker stop bcli-develop > /dev/null - echo "bcli-develop stopped" - elif [ "$1" = "mount" ]; then - if [ -z "$BROCCOLI_USER" ]; then - echo "Please set the BROCCOLI_USER environment variable for ssh access." - else - mkdir -p $HOME/tech - sshfs $BROCCOLI_USER@broccolimicro.io:/opt/tech $HOME/tech/ - fi - elif [ "$1" = "unmount" ]; then - shift - if [ "$1" = "-f" ]; then - pkill -KILL sshfs - fusermount -u $HOME/tech - else - umount $HOME/tech - fi - rmdir $HOME/tech - elif [ "$#" -eq 0 ]; then - docker exec -u $(id -u):$(id -g) -it bcli-develop /bin/bash + if [ "$1" = "up" ]; then + docker run --rm -d -v $HOME:/host --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" public.ecr.aws/l5h5o6z4/broccoli-cli:latest > /dev/null + echo "bcli-develop started" + elif [ "$1" = "down" ]; then + docker stop bcli-develop > /dev/null + echo "bcli-develop stopped" + #legacy, or if server files change faster than a new download + elif [ "$1" = "mount" ]; then + if [ -z "$BROCCOLI_USER" ]; then + echo "Please set the BROCCOLI_USER environment variable for ssh access." else - if [ "$1" != "--help" ]; then - echo "error: unrecognized command '$1'" - echo "" - fi + mkdir -p $HOME/tech + sshfs $BROCCOLI_USER@broccolimicro.io:/opt/tech $HOME/tech/ + fi + elif [ "$1" = "unmount" ]; then + shift + if [ "$1" = "-f" ]; then + pkill -KILL sshfs + fusermount -u $HOME/tech + else + umount $HOME/tech + fi + rmdir $HOME/tech + elif [ "$#" -eq 0 ]; then + docker exec -u $(id -u):$(id -g) -it bcli-develop /bin/bash + else + if [ "$1" != "--help" ]; then + echo "error: unrecognized command '$1'" + echo "" + fi - echo "usage: bcli " - echo "If command is empty, then start a terminal logged into the toolset." - echo " up - launch the toolset" - echo " down - shutdown the toolset" - echo " mount - mount the technology files from broccolimicro.io" - echo " unmount - unmount the technology files" - echo " -f - force the unmount if the connection has been broken" - fi + echo "usage: bcli " + echo "If command is empty, then start a terminal logged into the toolset." + echo " up - launch the toolset" + echo " down - shutdown the toolset" + echo " mount - legacy command; mount the technology files from broccolimicro.io" + echo " unmount - legacy command; unmount the technology files" + echo " -f - legacy option; force the unmount if the connection has been broken" + fi }