more style/function tweaks

plugins/tar/receive-app

@@ -3,7 +3,8 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 tar_receive_app() {
-  local desc="receives app tarball and calls tar:build"
+  local desc="tar receive-app plugin trigger"
+  local trigger="tar_receive_app"
   local APP="$1"; local REV="$2"
 
   # Don't trigger tar build if there is no tarball.

plugins/tar/subcommands/build-locked

@@ -12,7 +12,7 @@ tar_build_locked_cmd() {
 
   # clean up after ourselves
   local TMP_WORK_DIR=$(mktemp -d -t "dokku_tar.XXXX")
-  trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' INT TERM EXIT
+  trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
 
   # extract tar file
   chmod 755 "$TMP_WORK_DIR"