From f77a58e34aad4de024b8ba045bfdc206d342f3b0 Mon Sep 17 00:00:00 2001
From: Patrick Keroulas <patrick.keroulas@radio-canada.ca>
Date: Mon, 21 Mar 2022 12:07:12 -0400
Subject: [PATCH] install: use git submodules for dependencies

This is helpful for dependencies version management.
---
 .gitmodules                 | 12 ++++++++++++
 install.sh                  | 24 +++++++++---------------
 nmos-dep/nmos-common        |  1 +
 nmos-dep/nmos-mdns-bridge   |  1 +
 nmos-dep/nmos-node          |  1 +
 nmos-dep/nmos-reverse-proxy |  1 +
 6 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 nmos-dep/nmos-common
 create mode 160000 nmos-dep/nmos-mdns-bridge
 create mode 160000 nmos-dep/nmos-node
 create mode 160000 nmos-dep/nmos-reverse-proxy

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8ddae6e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "nmos-dep/nmos-common"]
+	path = nmos-dep/nmos-common
+	url = https://github.com/pkeroulas/nmos-common.git
+[submodule "nmos-dep/nmos-reverse-proxy"]
+	path = nmos-dep/nmos-reverse-proxy
+	url = https://github.com/pkeroulas/nmos-reverse-proxy.git
+[submodule "nmos-dep/nmos-node"]
+	path = nmos-dep/nmos-node
+	url = https://github.com/bbc/nmos-node.git
+[submodule "nmos-dep/nmos-mdns-bridge"]
+	path = nmos-dep/nmos-mdns-bridge
+	url = https://github.com/pkeroulas/nmos-mdns-bridge.git
diff --git a/install.sh b/install.sh
index 68d162f..eae1f00 100755
--- a/install.sh
+++ b/install.sh
@@ -10,8 +10,8 @@ set -e
 # Install dependencies
 apt-get install -y curl git
 
-# Capture the working directory
-DIR=$(pwd)
+# Capture the top directory
+TOP_DIR=$(dirname $(readlink -f $0))
 
 # Add apt repositories for NodeJS and Yarn
 curl -sL https://deb.nodesource.com/setup_12.x | bash -
@@ -21,10 +21,6 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.lis
 # Install NodeJS and Yarn
 apt-get update && apt-get install -y nodejs yarn
 
-# Create and cd into the directory required to run the provision_node script
-mkdir -p /home/vagrant
-cd /home/vagrant
-
 # Provision a Node
 #!/usr/bin/env bash
 
@@ -48,16 +44,14 @@ apt-get install -y python3 python3-pip python3-mock dh-python \
     python-setuptools python-all python3-setuptools python3-stdeb \
     python-is-python3
 
-git clone https://github.com/bbc/nmos-common.git
-git clone https://github.com/bbc/nmos-reverse-proxy.git
-git clone https://github.com/bbc/nmos-node.git
-git clone https://github.com/bbc/nmos-mdns-bridge.git
+git submodule update --init
+NMOS_DEP_DIR=${TOP_DIR}/nmos-dep
 
-cd /home/vagrant/nmos-common
+cd ${NMOS_DEP_DIR}/nmos-common
 pip3 install -e .
 install -m 666 /dev/null /var/log/nmos.log
 
-cd /home/vagrant/nmos-reverse-proxy
+cd ${NMOS_DEP_DIR}/nmos-reverse-proxy
 sed -i "s/, python3-nmoscommon//" stdeb.cfg
 make dsc
 mk-build-deps --install deb_dist/nmosreverseproxy_*.dsc --tool "$APT_TOOL"
@@ -65,7 +59,7 @@ make deb
 dpkg -i dist/python3-nmosreverseproxy_*_all.deb
 apt-get -f -y install
 
-cd /home/vagrant/nmos-mdns-bridge
+cd ${NMOS_DEP_DIR}/nmos-mdns-bridge
 sed -i "s/, python3-nmoscommon//" stdeb.cfg
 make dsc
 mk-build-deps --install deb_dist/mdnsbridge_*.dsc --tool "$APT_TOOL"
@@ -73,7 +67,7 @@ make deb
 dpkg -i dist/python3-mdnsbridge_*_all.deb
 apt-get -f -y install
 
-cd /home/vagrant/nmos-node
+cd ${NMOS_DEP_DIR}/nmos-node
 sed -i "s/, python3-nmoscommon//" stdeb.cfg
 make dsc
 mk-build-deps --install deb_dist/nodefacade_*.dsc --tool "$APT_TOOL"
@@ -84,4 +78,4 @@ apt-get -f -y install
 service apache2 restart
 
 # Move back to the starting directory
-cd $DIR
+cd $TOP_DIR
diff --git a/nmos-dep/nmos-common b/nmos-dep/nmos-common
new file mode 160000
index 0000000..c9ccff9
--- /dev/null
+++ b/nmos-dep/nmos-common
@@ -0,0 +1 @@
+Subproject commit c9ccff9df02a9d8e4df84145ab5df527f783d25b
diff --git a/nmos-dep/nmos-mdns-bridge b/nmos-dep/nmos-mdns-bridge
new file mode 160000
index 0000000..121fd45
--- /dev/null
+++ b/nmos-dep/nmos-mdns-bridge
@@ -0,0 +1 @@
+Subproject commit 121fd45e6bd63805161c5afec45fd630c8cf0904
diff --git a/nmos-dep/nmos-node b/nmos-dep/nmos-node
new file mode 160000
index 0000000..4987c58
--- /dev/null
+++ b/nmos-dep/nmos-node
@@ -0,0 +1 @@
+Subproject commit 4987c581e73730303e16d9f1bd0532c1fc66beb9
diff --git a/nmos-dep/nmos-reverse-proxy b/nmos-dep/nmos-reverse-proxy
new file mode 160000
index 0000000..faf2a4e
--- /dev/null
+++ b/nmos-dep/nmos-reverse-proxy
@@ -0,0 +1 @@
+Subproject commit faf2a4e192e3004b36a718948d14d24b91b177c3