From d540636fd5cc523fc282fc2eaf869a992e22c29c Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Sun, 31 Oct 2021 22:49:13 +1000
Subject: [PATCH] Create an install script.

---
 Dockerfile       | 3 +--
 README.md        | 3 +--
 install          | 8 ++++++++
 make-appimage.py | 7 +------
 make-readme.py   | 3 +--
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100755 install

diff --git a/Dockerfile b/Dockerfile
index 6b54b7a..56f4603 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,6 @@ RUN git clone https://github.com/ahamilton/eris
 RUN cd eris && git checkout d83bea2ba8a419e2b3cd4fd4b3367e25fae6339d
 RUN rm -rf eris/.git
 RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata
-RUN cd eris && python3.9 -m pip install -r requirements.txt .
-RUN cd eris && ./install-tools
+RUN cd eris && ./install
 
 ENTRYPOINT ["eris"]
diff --git a/README.md b/README.md
index 003043c..157a68a 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
 
     # git clone https://github.com/ahamilton/eris
     # cd eris
-    # python3.9 -m pip install -r requirements.txt .
-    # ./install-tools
+    # ./install
     # eris -h
 
 ### Docker
diff --git a/install b/install
new file mode 100755
index 0000000..993d8b2
--- /dev/null
+++ b/install
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+
+set -e
+
+
+python3.9 -m pip install -r requirements.txt .
+./install-tools
diff --git a/make-appimage.py b/make-appimage.py
index 1176be9..0f625f0 100755
--- a/make-appimage.py
+++ b/make-appimage.py
@@ -68,11 +68,6 @@ def make_ubuntu_base():
     return base_paths
 
 
-def install_eris():
-    run_in_container("ubuntu", "python3.9 -m pip install -r requirements.txt .")
-    run_in_container("ubuntu", "./install-tools")
-
-
 def make_app_dir(app_dir, new_paths):
     os.mkdir(app_dir)
     make_sub_container("ubuntu", app_dir, new_paths)
@@ -98,7 +93,7 @@ def main(work_path):
     assert os.getuid() == 0 and os.getgid() == 0, "Need to be root."
     os.chdir(work_path)
     base_paths = make_ubuntu_base()
-    install_eris()
+    run_in_container("ubuntu", "./install")
     post_install_paths = relative_paths("ubuntu", all_paths("ubuntu"))
     new_paths = set(post_install_paths) - set(base_paths)
     new_paths = filter_paths(new_paths, ["/var/cache/apt/archives", "lto1"])
diff --git a/make-readme.py b/make-readme.py
index 00cc696..606ba82 100755
--- a/make-readme.py
+++ b/make-readme.py
@@ -27,8 +27,7 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
 
     # git clone https://github.com/ahamilton/eris
     # cd eris
-    # python3.9 -m pip install -r requirements.txt .
-    # ./install-tools
+    # ./install
     # eris -h
 
 ### Docker