From 58b78e9ce4f5d340dd03b82cbdbf74929482f70b Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Wed, 3 Nov 2021 21:23:15 +1000
Subject: [PATCH] Move packaging scripts for docker and appimage into
 subdirectory.

- De-clutter the project root directory.
---
 README.md                                           |   4 ++--
 Dockerfile => packaging/Dockerfile                  |   2 +-
 RELEASES => packaging/RELEASES                      |   0
 {appimage => packaging/appimage}/AppRun             |   0
 {appimage => packaging/appimage}/eris.desktop       |   0
 {appimage => packaging/appimage}/eris.png           | Bin
 {appimage => packaging/appimage}/libunionpreload.so | Bin
 eris-docker => packaging/eris-docker                |   0
 make-appimage.py => packaging/make-appimage.py      |   2 +-
 make-readme.py => packaging/make-readme.py          |   4 ++--
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename Dockerfile => packaging/Dockerfile (83%)
 rename RELEASES => packaging/RELEASES (100%)
 rename {appimage => packaging/appimage}/AppRun (100%)
 rename {appimage => packaging/appimage}/eris.desktop (100%)
 rename {appimage => packaging/appimage}/eris.png (100%)
 rename {appimage => packaging/appimage}/libunionpreload.so (100%)
 rename eris-docker => packaging/eris-docker (100%)
 rename make-appimage.py => packaging/make-appimage.py (98%)
 rename make-readme.py => packaging/make-readme.py (90%)

diff --git a/README.md b/README.md
index 157a68a..41bb126 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,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
-    # sudo docker build -t eris .
-    # cp eris-docker ~/bin/eris    # e.g. Put wrapper script in your PATH
+    # sudo docker build -t eris -f packaging/Dockerfile .
+    # cp packaging/eris-docker ~/bin/eris    # e.g. Put wrapper script in your PATH
     # eris -h
 
 ### AppImage
diff --git a/Dockerfile b/packaging/Dockerfile
similarity index 83%
rename from Dockerfile
rename to packaging/Dockerfile
index 56f4603..f044c33 100644
--- a/Dockerfile
+++ b/packaging/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:impish
 
 RUN apt update && apt install -y git sudo
 RUN git clone https://github.com/ahamilton/eris
-RUN cd eris && git checkout d83bea2ba8a419e2b3cd4fd4b3367e25fae6339d
+RUN cd eris && git checkout 0f59e4339548de8bcccc3ebf85be9b2b49fd10f0
 RUN rm -rf eris/.git
 RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata
 RUN cd eris && ./install
diff --git a/RELEASES b/packaging/RELEASES
similarity index 100%
rename from RELEASES
rename to packaging/RELEASES
diff --git a/appimage/AppRun b/packaging/appimage/AppRun
similarity index 100%
rename from appimage/AppRun
rename to packaging/appimage/AppRun
diff --git a/appimage/eris.desktop b/packaging/appimage/eris.desktop
similarity index 100%
rename from appimage/eris.desktop
rename to packaging/appimage/eris.desktop
diff --git a/appimage/eris.png b/packaging/appimage/eris.png
similarity index 100%
rename from appimage/eris.png
rename to packaging/appimage/eris.png
diff --git a/appimage/libunionpreload.so b/packaging/appimage/libunionpreload.so
similarity index 100%
rename from appimage/libunionpreload.so
rename to packaging/appimage/libunionpreload.so
diff --git a/eris-docker b/packaging/eris-docker
similarity index 100%
rename from eris-docker
rename to packaging/eris-docker
diff --git a/make-appimage.py b/packaging/make-appimage.py
similarity index 98%
rename from make-appimage.py
rename to packaging/make-appimage.py
index 0f625f0..e8d1489 100755
--- a/make-appimage.py
+++ b/packaging/make-appimage.py
@@ -73,7 +73,7 @@ def make_app_dir(app_dir, new_paths):
     make_sub_container("ubuntu", app_dir, new_paths)
     cmd(f"cp -a {ERIS_PATH}/tests {app_dir}")
     cmd(f"cp -a {ERIS_PATH}/test-all {app_dir}")
-    cmd(f"cp {ERIS_PATH}/appimage/* {app_dir}")
+    cmd(f"cp {ERIS_PATH}/packaging/appimage/* {app_dir}")
 
 
 def cleanup_app_dir(app_dir):
diff --git a/make-readme.py b/packaging/make-readme.py
similarity index 90%
rename from make-readme.py
rename to packaging/make-readme.py
index 606ba82..c0bc9d5 100755
--- a/make-readme.py
+++ b/packaging/make-readme.py
@@ -34,8 +34,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
-    # sudo docker build -t eris .
-    # cp eris-docker ~/bin/eris    # e.g. Put wrapper script in your PATH
+    # sudo docker build -t eris -f packaging/Dockerfile .
+    # cp packaging/eris-docker ~/bin/eris    # e.g. Put wrapper script in your PATH
     # eris -h
 
 ### AppImage