From 6530cd7d1a0913c88548da318edf2cf0fbe97d07 Mon Sep 17 00:00:00 2001
From: Branton Davis <bluecamel@gmail.com>
Date: Tue, 5 Oct 2021 21:00:00 -0500
Subject: [PATCH] Use NodeODM master and cleanup path.

---
 dpkg/build.sh               | 4 ++--
 dpkg/webodm/DEBIAN/postinst | 2 +-
 dpkg/webodm/DEBIAN/postrm   | 2 +-
 dpkg/webodm/DEBIAN/prerm    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dpkg/build.sh b/dpkg/build.sh
index 552f0765..2e26ff79 100755
--- a/dpkg/build.sh
+++ b/dpkg/build.sh
@@ -11,7 +11,7 @@ WEBODM_DPKG_NAME="webodm_${WEBODM_VERSION}-${WEBODM_DPKG_VERSION}"
 BUILD_DIR="${HERE}/build"
 DEB_DIR="${HERE}/deb"
 WEBODM_DIR="${HERE}/${WEBODM_DPKG_NAME}/opt/WebODM"
-NODEODM_DIR="${HERE}/${WEBODM_DPKG_NAME}/opt/nodeodm"
+NODEODM_DIR="${HERE}/${WEBODM_DPKG_NAME}/opt/NodeODM"
 
 function build() {
     prepareBuildDir
@@ -57,7 +57,7 @@ function prepareDebDir() {
 
 function prepareNodeODMDir() {
     # This can go away when we can pull the image from Docker Hub.
-    git clone -b bkd/gpu https://github.com/airmap/nodeodm.git "${BUILD_DIR}/${WEBODM_DPKG_NAME}/${WEBODM_DPKG_NAME}/opt/nodeodm"
+    git clone https://github.com/OpenDroneMap/NodeODM.git "${BUILD_DIR}/${WEBODM_DPKG_NAME}/${WEBODM_DPKG_NAME}/opt/NodeODM"
 }
 
 function prepareWebODMDir() {
diff --git a/dpkg/webodm/DEBIAN/postinst b/dpkg/webodm/DEBIAN/postinst
index ad75875f..36a565d5 100755
--- a/dpkg/webodm/DEBIAN/postinst
+++ b/dpkg/webodm/DEBIAN/postinst
@@ -7,7 +7,7 @@ export WEBODM_USER=odm
 export WEBODM_USER_HOME="/home/${WEBODM_USER}"
 export WEBODM_DIR=/opt/WebODM
 export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
-export NODEODM_DIR=/opt/nodeodm
+export NODEODM_DIR=/opt/NodeODM
 
 function abortRemove() {
     echo "Unable to remove webodm."
diff --git a/dpkg/webodm/DEBIAN/postrm b/dpkg/webodm/DEBIAN/postrm
index fbe2731e..081ab789 100755
--- a/dpkg/webodm/DEBIAN/postrm
+++ b/dpkg/webodm/DEBIAN/postrm
@@ -7,7 +7,7 @@ export WEBODM_USER=odm
 export WEBODM_USER_HOME="/home/${WEBODM_USER}"
 export WEBODM_DIR=/opt/WebODM
 export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
-export NODEODM_DIR=/opt/nodeodm
+export NODEODM_DIR=/opt/NodeODM
 
 function abortInstall() {
     purge
diff --git a/dpkg/webodm/DEBIAN/prerm b/dpkg/webodm/DEBIAN/prerm
index 27ab1e3f..b3cbbf4e 100755
--- a/dpkg/webodm/DEBIAN/prerm
+++ b/dpkg/webodm/DEBIAN/prerm
@@ -7,7 +7,7 @@ export WEBODM_USER=odm
 export WEBODM_USER_HOME="/home/${WEBODM_USER}"
 export WEBODM_DIR=/opt/WebODM
 export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
-export NODEODM_DIR=/opt/nodeodm
+export NODEODM_DIR=/opt/NodeODM
 
 function remove() {
     stopService