From f3ba806e4a391036bb8e321ba859b573afb6d3e1 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Fri, 14 Dec 2018 00:57:50 -0500
Subject: [PATCH] Major script cleanups based on feedback

---
 build-deb.sh | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/build-deb.sh b/build-deb.sh
index 43c5d20279..a857257086 100755
--- a/build-deb.sh
+++ b/build-deb.sh
@@ -1,21 +1,23 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 # Build a Jellyfin .deb file with Docker on Linux
 # Places the output .deb file in the parent directory
 
 set -o xtrace
 set -o errexit
-set -o pipefail
 set -o nounset
 
-date="$( date +%s )"
-curdir="$( pwd )"
-tmpdir="$( mktemp -d )"
-curuser="$( whoami )"
+package_temporary_dir="`mktemp -d`"
+current_user="`whoami`"
+image_name="jellyfin-debuild"
 
-docker build ${curdir} --tag jellyfin-debuild-${date} --file ${curdir}/Dockerfile.debian_package
-docker run --volume ${tmpdir}:/temp --interactive --tty jellyfin-debuild-${date} cp --recursive /dist /temp/
-docker image rm jellyfin-debuild-${date} --force
-sudo chown --recursive ${curuser} ${tmpdir}
-mv ${tmpdir}/dist/*.deb ${curdir}/../
-rm --recursive --force ${tmpdir}
+cleanup() {
+    docker image rm $image_name --force
+    test -d ${package_temporary_dir} && rm -r ${package_temporary_dir}
+}
+trap cleanup EXIT
+
+docker build . -t $image_name -f ./Dockerfile.debian_package
+docker run --rm -v $package_temporary_dir:/temp $image_name cp -r /dist /temp/
+sudo chown -R $current_user $package_temporary_dir
+mv $package_temporary_dir/dist/*.deb ../