Drop install-dependencies script.

- Do a standard install with pip.
- Run install-tools afterwards.
- util-linux was needed for what?

Dockerfile

@@ -9,7 +9,7 @@ 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 && ./install-dependencies
-RUN python3.9 -m pip install ./eris
+RUN cd eris && python3.9 -m pip install -r requirements.txt .
+RUN cd eris && ./install-tools
 
 ENTRYPOINT ["eris"]

README.md

@@ -10,8 +10,8 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
 
     # git clone https://github.com/ahamilton/eris
     # cd eris
-    # ./install-dependencies
-    # python3.9 -m pip install .
+    # python3.9 -m pip install -r requirements.txt .
+    # ./install-tools
     # eris -h
 
 ### Docker

install-dependencies

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-
-set -e
-
-
-DIST_ID=$(cat /etc/os-release | grep "^ID=" | cut -d "=" -f 2)
-if [ $DIST_ID != "ubuntu" ]; then
-    echo "Eris can only be installed on Ubuntu."
-    exit 1
-fi
-echo "Installing the dependencies of the eris script…"
-sudo apt --yes install python3-pip python3.9 util-linux
-python3.9 -m pip install -r requirements.txt
-echo
-echo "Installing all the tools eris may need…"
-./install-tools

make-appimage.py

@@ -69,8 +69,8 @@ def make_ubuntu_base():
 
 
 def install_eris():
-    run_in_container("ubuntu", "./install-dependencies")
-    run_in_container("ubuntu", "pip3 install -I .")
+    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):

make-readme.py

@@ -27,8 +27,8 @@ Eris maintains an up-to-date set of reports for every file in a codebase.
 
     # git clone https://github.com/ahamilton/eris
     # cd eris
-    # ./install-dependencies
-    # python3.9 -m pip install .
+    # python3.9 -m pip install -r requirements.txt .
+    # ./install-tools
     # eris -h
 
 ### Docker