From 0b40414170060d8e5c9443652821103b86f55c8f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 17 Feb 2020 18:27:11 -0500 Subject: [PATCH] refactor: use normal if statement instead of && calls --- plugins/domains/post-app-rename-setup | 8 ++++++-- plugins/git/post-app-clone-setup | 4 +++- plugins/git/post-app-rename-setup | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/domains/post-app-rename-setup b/plugins/domains/post-app-rename-setup index 08be9639d..7a2d2a5ff 100755 --- a/plugins/domains/post-app-rename-setup +++ b/plugins/domains/post-app-rename-setup @@ -7,8 +7,12 @@ trigger-domains-post-app-rename-setup() { declare trigger="post-app-rename-setup" declare OLD_APP="$1" NEW_APP="$2" - [[ -f "$DOKKU_ROOT/$NEW_APP/URLS" ]] && sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS" - [[ -f "$DOKKU_ROOT/$NEW_APP/VHOST" ]] && sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST" + if [[ -f "$DOKKU_ROOT/$NEW_APP/URLS" ]]; then + sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS" + fi + if [[ -f "$DOKKU_ROOT/$NEW_APP/VHOST" ]]; then + sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST" + fi } trigger-domains-post-app-rename-setup "$@" diff --git a/plugins/git/post-app-clone-setup b/plugins/git/post-app-clone-setup index 68fda4efb..68db5a879 100755 --- a/plugins/git/post-app-clone-setup +++ b/plugins/git/post-app-clone-setup @@ -7,7 +7,9 @@ trigger-git-post-app-clone-setup() { declare trigger="post-app-clone-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" + if [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]]; then + sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" + fi } trigger-git-post-app-clone-setup "$@" diff --git a/plugins/git/post-app-rename-setup b/plugins/git/post-app-rename-setup index c23634b08..544da745b 100755 --- a/plugins/git/post-app-rename-setup +++ b/plugins/git/post-app-rename-setup @@ -7,7 +7,9 @@ trigger-git-post-app-rename-setup() { 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" + if [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]]; then + sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" + fi } trigger-git-post-app-rename-setup "$@"