diff --git a/Dockerfile b/Dockerfile index 427aeebf..089d7a92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,7 @@ RUN pip install -r requirements.txt ADD . /webodm/ -RUN git submodule init -RUN git submodule update +RUN git submodule update --init # Install Node.js RUN curl --silent --location https://deb.nodesource.com/setup_6.x | bash - diff --git a/devenv.sh b/devenv.sh index 73e9c26e..429ad37d 100755 --- a/devenv.sh +++ b/devenv.sh @@ -1,7 +1,8 @@ #!/bin/bash set -eo pipefail +__dirname=$(cd $(dirname "$0"); pwd -P) -./webodm.sh checkenv +${__dirname}/webodm.sh checkenv usage(){ echo "Usage: $0 [options]" @@ -25,7 +26,7 @@ start(){ } stop(){ - run "./webodm.sh stop" + run "${__dirname}/webodm.sh stop" } runtests(){ diff --git a/slate/source/includes/_fordevelopers.md b/slate/source/includes/_fordevelopers.md index 2f892c9b..8dc21ae4 100644 --- a/slate/source/includes/_fordevelopers.md +++ b/slate/source/includes/_fordevelopers.md @@ -32,7 +32,7 @@ If you can follow the instructions to [run WebODM natively](https://github.com/O ## Run Unit Tests -We believe testing is a necessary part of deliverying software of a certain quality. We try to achieve complete test coverage for backend code, while we are more relaxed about front end testing. See [#119](https://github.com/OpenDroneMap/WebODM/issues/119). +We think testing is a necessary part of delivering robust software. We try to achieve complete test coverage for backend code, while we are more relaxed about front end testing. See [#119](https://github.com/OpenDroneMap/WebODM/issues/119). To run the unit tests, simply type: diff --git a/start.sh b/start.sh index b01bcaaf..67194d4b 100755 --- a/start.sh +++ b/start.sh @@ -1,4 +1,6 @@ #!/bin/bash +__dirname=$(cd $(dirname "$0"); pwd -P) +cd ${__dirname} echo -e "\033[92m" echo " _ __ __ ____ ____ __ ___" @@ -36,9 +38,8 @@ fi if [ $1 = "--setup-devenv" ] || [ $2 = "--setup-devenv" ]; then echo Setup git modules... - - git submodule init - git submodule update + + git submodule update --init echo Setup npm dependencies... npm install