Refactor domain add functions
This commit is contained in:
@@ -57,10 +57,7 @@ domains_add() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
for DOMAIN in "$@"; do
|
for DOMAIN in "$@"; do
|
||||||
if [[ $(
|
if grep -x --line-regexp --fixed-strings "$DOMAIN" "$APP_VHOST_PATH" 2> /dev/null; then
|
||||||
grep -w -E "^$DOMAIN$" "$APP_VHOST_PATH" >/dev/null 2>&1
|
|
||||||
echo $?
|
|
||||||
) -eq 0 ]]; then
|
|
||||||
dokku_log_info1 "Skipping: $DOMAIN already added to $APP"
|
dokku_log_info1 "Skipping: $DOMAIN already added to $APP"
|
||||||
else
|
else
|
||||||
echo "$DOMAIN" >>"$APP_VHOST_PATH"
|
echo "$DOMAIN" >>"$APP_VHOST_PATH"
|
||||||
@@ -159,13 +156,10 @@ domains_add_global() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
for DOMAIN in "$@"; do
|
for DOMAIN in "$@"; do
|
||||||
if [[ $(
|
if grep -q --line-regexp --fixed-strings "$DOMAIN" "$GLOBAL_VHOST_PATH" 2> /dev/null; then
|
||||||
grep -w -E "^$DOMAIN$" "$GLOBAL_VHOST_PATH" >/dev/null 2>&1
|
dokku_log_info1 "Skipping $DOMAIN: already added"
|
||||||
echo $?
|
|
||||||
) -eq 0 ]]; then
|
|
||||||
dokku_log_info1 "Skipping: $DOMAIN already added"
|
|
||||||
else
|
else
|
||||||
grep -qxF "$DOMAIN" "$GLOBAL_VHOST_PATH" || echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
|
echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
|
||||||
dokku_log_info1 "Added $DOMAIN"
|
dokku_log_info1 "Added $DOMAIN"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user