From 4743aacce833ac4d11316cd9da13dc5f493b1445 Mon Sep 17 00:00:00 2001 From: Marco Salathe Date: Tue, 2 Oct 2018 10:06:26 -0700 Subject: [PATCH 1/3] More flexible installation script --- install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index c569148..69cd5a9 100755 --- a/install.sh +++ b/install.sh @@ -24,15 +24,15 @@ echo $PWD echo "Installing object detection library" echo $PROTOC $PROTOC object_detection/protos/*.proto --python_out=. -$PYTHON setup.py install --user +$PYTHON setup.py install $@ popd pushd $MODELS_DIR/research/slim echo $PWD echo "Installing slim library" -$PYTHON setup.py install --user +$PYTHON setup.py install $@ popd echo "Installing tf_trt_models" echo $PWD -$PYTHON setup.py install --user +$PYTHON setup.py install $@ From 28a2c930c5e8f79b1a0492f3602c459889ecbc17 Mon Sep 17 00:00:00 2001 From: Marco Salathe Date: Tue, 2 Oct 2018 10:35:49 -0700 Subject: [PATCH 2/3] Small improvement to also make develop and python work --- install.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index 69cd5a9..dee70b4 100755 --- a/install.sh +++ b/install.sh @@ -4,11 +4,15 @@ INSTALL_PROTOC=$PWD/scripts/install_protoc.sh MODELS_DIR=$PWD/third_party/models PYTHON=python - -if [ $# -eq 1 ]; then - PYTHON=$1 -fi - +INSTALL="install" +for arg do + shift + case $arg in + develop) INSTALL="develop";; + *python*) PYTHON=$arg;; + *) set -- "$@" "$arg";; + esac +done echo $PYTHON # install protoc @@ -24,15 +28,15 @@ echo $PWD echo "Installing object detection library" echo $PROTOC $PROTOC object_detection/protos/*.proto --python_out=. -$PYTHON setup.py install $@ +echo $PYTHON setup.py $INSTALL $@ popd pushd $MODELS_DIR/research/slim echo $PWD echo "Installing slim library" -$PYTHON setup.py install $@ +echo $PYTHON setup.py $INSTALL $@ popd echo "Installing tf_trt_models" echo $PWD -$PYTHON setup.py install $@ +echo $PYTHON setup.py $INSTALL $@ From 6f0ad5c2d932aaa0add455c6aadf3803c8a08c2d Mon Sep 17 00:00:00 2001 From: Marco Salathe Date: Tue, 2 Oct 2018 10:38:00 -0700 Subject: [PATCH 3/3] Allow install to be a parameter too --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index dee70b4..9484407 100755 --- a/install.sh +++ b/install.sh @@ -9,6 +9,7 @@ for arg do shift case $arg in develop) INSTALL="develop";; + install) INSTALL="install";; *python*) PYTHON=$arg;; *) set -- "$@" "$arg";; esac