From 5801fd98a403d3ebce94887c16893789aa15c45d Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 17 Feb 2020 06:20:20 -0500
Subject: [PATCH] refactor: move pre-receive hook modification to
 post-app-rename-setup trigger

---
 plugins/apps/subcommands/rename   |  1 -
 plugins/git/post-app-rename-setup | 13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100755 plugins/git/post-app-rename-setup

diff --git a/plugins/apps/subcommands/rename b/plugins/apps/subcommands/rename
index 5a46b0b18..bcb8947e5 100755
--- a/plugins/apps/subcommands/rename
+++ b/plugins/apps/subcommands/rename
@@ -26,7 +26,6 @@ cmd-apps-rename() {
   cp -a "$DOKKU_ROOT/$OLD_APP/." "$DOKKU_ROOT/$NEW_APP"
   plugn trigger post-app-rename-setup "$OLD_APP" "$NEW_APP"
   DOKKU_APPS_FORCE_DELETE=1 apps_destroy "$OLD_APP"
-  [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]] && sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
   plugn trigger post-app-rename "$OLD_APP" "$NEW_APP"
   docker_cleanup "$OLD_APP" "true"
   echo "Renaming $OLD_APP to $NEW_APP... done"
diff --git a/plugins/git/post-app-rename-setup b/plugins/git/post-app-rename-setup
new file mode 100755
index 000000000..c23634b08
--- /dev/null
+++ b/plugins/git/post-app-rename-setup
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-git-post-app-rename-setup() {
+  declare desc="modifies git-hook"
+  declare trigger="post-app-rename-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]] && sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
+}
+
+trigger-git-post-app-rename-setup "$@"