From 047626909c6ec3db6271644e5b70716c567293ac Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 20 May 2018 19:02:10 -0400
Subject: [PATCH 1/2] fix: cleanup temporary changes during betafish releases

[ci skip]
---
 contrib/release | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/release b/contrib/release
index 2251be18e..5ee03a0ab 100755
--- a/contrib/release
+++ b/contrib/release
@@ -346,6 +346,10 @@ main() {
   fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
 
   fn-repo-push-tags "$IS_RELEASE"
+  if [[ "$IS_RELEASE" != "true" ]]; then
+    git reset -q HEAD plugins/*/plugin.toml
+    git checkout -- plugins/*/plugin.toml
+  fi
 }
 
 main "$@"

From aad283a98116dcb5053c095de686d335e549803d Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 20 May 2018 19:03:09 -0400
Subject: [PATCH 2/2] fix: add missing default value for exit code during
 dokku-update releases

---
 contrib/release-dokku-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/release-dokku-update b/contrib/release-dokku-update
index 36963540f..740524dc1 100755
--- a/contrib/release-dokku-update
+++ b/contrib/release-dokku-update
@@ -55,7 +55,7 @@ fn-publish-package() {
   declare desc="Publishes a package to packagecloud"
   declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
   local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
-  local OS_ID ex
+  local OS_ID ex EXIT_CODE=0
 
   [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7