From 1b7761ce8d844531cd9bb4857a576d5b18d71fc5 Mon Sep 17 00:00:00 2001
From: Hugo Peixoto <hugo.peixoto@gmail.com>
Date: Sun, 19 Jul 2020 16:29:11 +0100
Subject: [PATCH] Refactor domain add functions

---
 plugins/domains/functions | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/plugins/domains/functions b/plugins/domains/functions
index b5d7096c1..6a4974ab6 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -57,10 +57,7 @@ domains_add() {
   done
 
   for DOMAIN in "$@"; do
-    if [[ $(
-      grep -w -E "^$DOMAIN$" "$APP_VHOST_PATH" >/dev/null 2>&1
-      echo $?
-    ) -eq 0 ]]; then
+    if grep -x --line-regexp --fixed-strings "$DOMAIN" "$APP_VHOST_PATH" 2> /dev/null; then
       dokku_log_info1 "Skipping: $DOMAIN already added to $APP"
     else
       echo "$DOMAIN" >>"$APP_VHOST_PATH"
@@ -159,13 +156,10 @@ domains_add_global() {
   done
 
   for DOMAIN in "$@"; do
-    if [[ $(
-      grep -w -E "^$DOMAIN$" "$GLOBAL_VHOST_PATH" >/dev/null 2>&1
-      echo $?
-    ) -eq 0 ]]; then
-      dokku_log_info1 "Skipping: $DOMAIN already added"
+    if grep -q --line-regexp --fixed-strings "$DOMAIN" "$GLOBAL_VHOST_PATH" 2> /dev/null; then
+      dokku_log_info1 "Skipping $DOMAIN: already added"
     else
-      grep -qxF "$DOMAIN" "$GLOBAL_VHOST_PATH" || echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
+      echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
       dokku_log_info1 "Added $DOMAIN"
     fi
   done