From 546f4cd46f21561d9f39ee695fdfa6809e0d9c29 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Tue, 5 Feb 2019 18:40:31 -0500
Subject: [PATCH] Add prerequisite keep_artifacts var

---
 build                | 23 +++++++++++++++++------
 deployment/README.md |  2 ++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build b/build
index 7d49db72a..7413b60e3 100755
--- a/build
+++ b/build
@@ -23,7 +23,7 @@ usage() {
     echo -e "Usage:"
     echo -e " $ build --list-platforms"
     echo -e " $ build --list-actions <platform>"
-    echo -e " $ build [-b/--web-branch <web_branch>] <platform> <action>"
+    echo -e " $ build [-k/--keep-artifacts] [-b/--web-branch <web_branch>] <platform> <action>"
     echo -e ""
     echo -e "The web_branch defaults to the same branch name as the current main branch."
     echo -e "To build all platforms, use 'all'."
@@ -67,6 +67,14 @@ if [[ $1 == '--list-actions' ]]; then
     exit 0
 fi
 
+# Parse keep-artifacts option
+if [[ $1 == '-k' || $1 == '--keep-artifacts' ]]; then
+    keep_artifacts="y"
+    shift 1
+else
+    keep_artifacts="n"
+fi
+
 # Parse branch option
 if [[ $1 == '-b' || $1 == '--web-branch' ]]; then
 	web_branch="$2"
@@ -193,6 +201,13 @@ for target_platform in ${platform[@]}; do
     echo -e "> Processing platform ${target_platform}"
     date_start=$( date +%s )
     pushd ${target_platform}
+    cleanup() {
+        echo -e ">> Processing action clean"
+        if [[ -f clean.sh && -x clean.sh ]]; then
+            ./clean.sh ${keep_artifacts}
+        fi
+    }
+    trap cleanup EXIT INT
     for target_action in ${action[@]}; do
         echo -e ">> Processing action ${target_action}"
         if [[ -f ${target_action}.sh && -x ${target_action}.sh ]]; then
@@ -204,12 +219,8 @@ for target_platform in ${platform[@]}; do
         target_dir="../../../jellyfin-build/${target_platform}"
         mkdir -p ${target_dir}
         mv pkg-dist/* ${target_dir}/
-
-        echo -e ">> Processing action clean"
-        if [[ -f clean.sh && -x clean.sh ]]; then
-            ./clean.sh 
-        fi
     fi
+    cleanup
     date_end=$( date +%s )
     echo -e "> Completed platform ${target_platform} in $( expr ${date_end} - ${date_start} ) seconds."
     popd
diff --git a/deployment/README.md b/deployment/README.md
index 05b4ed51e..608d80e58 100644
--- a/deployment/README.md
+++ b/deployment/README.md
@@ -55,6 +55,8 @@ These builds are not necessarily run from the `build` script, but are present fo
 
 * The `clean` action should always `exit 0` even if no work is done or it fails.
 
+* The `clean` action can be passed a variable as argument 1, named `keep_artifacts`. It is indended to handle situations when the user runs `build --keep-artifacts` and should be handled intelligently. Usually, this is used to preserve Docker images while still removing temporary directories.
+
 ### Output Files
 
 * Upon completion of the defined actions, at least one output file must be created in the `<platform>/pkg-dist` directory.