From ec6b0dbc649aa62608a827c4d54eec2cf2102ece Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Sun, 29 Jan 2017 10:07:30 -0500 Subject: [PATCH] Added COMPOSE_CONVERT_WINDOWS_PATHS env variable to webodm.sh, updated readme --- README.md | 2 +- nodeodm/external/node-OpenDroneMap | 2 +- webodm.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9413a231..37b0f516 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ If you know Python, web technologies (JS, HTML, CSS, etc.) or both, make a fork, * From the Docker Quickstart Terminal (Windows) or from the command line (Mac / Linux) type: ```bash -git clone https://github.com/OpenDroneMap/WebODM +git clone https://github.com/OpenDroneMap/WebODM --config core.autocrlf=input cd WebODM ./webodm.sh start ``` diff --git a/nodeodm/external/node-OpenDroneMap b/nodeodm/external/node-OpenDroneMap index baef4f81..254ce04f 160000 --- a/nodeodm/external/node-OpenDroneMap +++ b/nodeodm/external/node-OpenDroneMap @@ -1 +1 @@ -Subproject commit baef4f817e1928090b522a2e871de0568377d043 +Subproject commit 254ce04f55db521acbae1b38294d2ec65e3c8a09 diff --git a/webodm.sh b/webodm.sh index 738c86fc..113c6d28 100755 --- a/webodm.sh +++ b/webodm.sh @@ -12,6 +12,10 @@ case $uname in ;; esac +if [[ $platform = "Windows" ]]; then + export COMPOSE_CONVERT_WINDOWS_PATHS=1 +fi + usage(){ echo "Usage: $0 [options]" echo