Permalink
Browse files

Merge pull request #389 from amiramix/non-linux-updates-1

Make find BSD compatible + change error about site not resolving into a warning
  • Loading branch information...
2 parents 0c0b58c + 1c73c4c commit 5558c79226e779dcf248c727e3635a3342f78e08 @mworrell mworrell committed Aug 23, 2012
Showing with 5 additions and 4 deletions.
  1. +1 −1 bin/zotonic
  2. +4 −3 src/scripts/zotonic-addsite
View
@@ -31,7 +31,7 @@ then
echo Usage: `basename $0` [command] 1>&2
echo 1>&2
echo Where [command] is one of: 1>&2
- CMDS="`find $ZOTONIC_SCRIPTS/zotonic-* -perm /a+x | sed 's/.*zotonic-//g'`"
+ CMDS="`find $ZOTONIC_SCRIPTS/zotonic-* -perm -a+x | sed 's/.*zotonic-//g'`"
echo $CMDS 1>&2
echo 1>&2
echo see doc/ZotonicCommands.txt for more info 1>&2
@@ -153,13 +153,14 @@ function check_options {
if ! ping -c 1 -q $SITE &>/dev/null; then
- echo "$SITE cannot be reached. You should add $SITE to your /etc/hosts file,"
+ echo "Warning!"
+ echo "Site: '$SITE' cannot be reached."
+ echo "Command 'host $SITE' must resolve to an IP address,"
echo "otherwise you won't be able to reach it after installing the site."
- echo "Add the following line to /etc/hosts:"
+ echo "You can fix that by adding the following line to /etc/hosts:"
echo
echo "127.0.0.1 $SITE"
echo
- exit 1
fi

0 comments on commit 5558c79

Please sign in to comment.