From 36d2de5bbd75de07586e7e383b4007572a6c6bdc Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Sat, 25 Apr 2020 23:49:33 -0400
Subject: [PATCH] mistborn-cli

---
 .gitmodules                            | 3 +++
 modules/mistborn-cli                   | 1 +
 scripts/install.sh                     | 4 ++++
 scripts/subinstallers/docker.sh        | 3 +++
 scripts/subinstallers/docker_manual.sh | 3 ---
 scripts/update.sh                      | 6 ++++++
 6 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 modules/mistborn-cli

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..067e6f8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "modules/mistborn-cli"]
+	path = modules/mistborn-cli
+	url = https://gitlab.com/cyber5k/mistborn-cli.git
diff --git a/modules/mistborn-cli b/modules/mistborn-cli
new file mode 160000
index 0000000..24174d1
--- /dev/null
+++ b/modules/mistborn-cli
@@ -0,0 +1 @@
+Subproject commit 24174d1c12723081dbaac650753431d28bd0973f
diff --git a/scripts/install.sh b/scripts/install.sh
index 57765e8..e33ff8a 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -148,6 +148,10 @@ then
     source ./scripts/subinstallers/cockpit.sh
 fi
 
+# Mistborn-cli (pip3 installed by docker)
+figlet "Mistborn: Installing mistborn-cli"
+sudo pip3 install -e ./modules/mistborn-cli
+
 # Mistborn
 # final setup vars
 iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}')
diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index 1542207..b21d452 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Docker
+figlet "Mistborn: Installing Docker"
+
 sudo apt update
 sudo apt install -y python python3-pip python3-setuptools libffi-dev python3-dev libssl-dev
 
diff --git a/scripts/subinstallers/docker_manual.sh b/scripts/subinstallers/docker_manual.sh
index 176aba9..9692109 100755
--- a/scripts/subinstallers/docker_manual.sh
+++ b/scripts/subinstallers/docker_manual.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Docker
-figlet "Mistborn: Installing Docker"
-
 # dependencies
 echo "Installing Docker dependencies"
 sudo apt-get install -y \
diff --git a/scripts/update.sh b/scripts/update.sh
index 64e30a9..67ed331 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,6 +2,12 @@
 
 set -e
 
+sudo git -C /opt/mistborn pull
+sudo git -C /opt/mistborn submodule update --init --recursive
+
+# ensure mistborn-cli is installed
+sudo pip3 install -e /opt/mistborn/modules/mistborn-cli
+
 iface=$(ip -o -4 route show to default | egrep -o 'dev [^ ]*' | awk 'NR==1{print $2}')
 sudo cp ./scripts/services/Mistborn* /etc/systemd/system/
 sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/User=root/User=mistborn/"