Merge pull request #2485 from znz/fix-domains-add-global

Fix bug when VHOST without newline
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2016-11-21 22:10:10 -07:00
commit 7cfbdf34ec
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -148,7 +148,7 @@ domains_add_global() {
if [[ $(egrep -w "^$DOMAIN$" "$GLOBAL_VHOST_PATH" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
dokku_log_info1 "Skipping: $DOMAIN already added"
else
echo "$DOMAIN" >> "$GLOBAL_VHOST_PATH"
sed -i -e "\$a\\$DOMAIN" "$GLOBAL_VHOST_PATH"
dokku_log_info1 "Added $DOMAIN"
fi
done
+1 -1
View File
@@ -170,7 +170,7 @@ teardown() {
echo "status: "$status
assert_success
run bash -c "dokku domains | grep -q global.dokku.me"
run bash -c "dokku domains | egrep -qw '^global.dokku.me\$'"
echo "output: "$output
echo "status: "$status
assert_success