From: Paul Wise Date: Thu, 26 Feb 2015 04:52:40 +0000 (+0800) Subject: Fix typo stating -> staging X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=f7ab61d35241f1435cbb263ac892e9eb6ceeb75a Fix typo stating -> staging Signed-off-by: Paul Wise --- diff --git a/apache2-vhost-update b/apache2-vhost-update index 24d59c8..de224ea 100755 --- a/apache2-vhost-update +++ b/apache2-vhost-update @@ -42,7 +42,7 @@ -STATINGDIR="/etc/apache2/sites-staging" +STAGINGDIR="/etc/apache2/sites-staging" DESTINATION="/etc/apache2/sites-available" usage() { @@ -91,8 +91,8 @@ if echo "$site" | grep /; then exit 1 fi -if ! [ -f "$STATINGDIR/$site" ]; then - echo "$STATINGDIR/$site does not exist or is not a file" >&2 +if ! [ -f "$STAGINGDIR/$site" ]; then + echo "$STAGINGDIR/$site does not exist or is not a file" >&2 exit 1 fi @@ -102,7 +102,7 @@ if [ "$?" != "0" ]; then exit 1 fi -if diff "$STATINGDIR/$site" "$DESTINATION/$site" > /dev/null; then +if diff "$STAGINGDIR/$site" "$DESTINATION/$site" > /dev/null; then echo "No differences, not doing anything." >&2 exit 1 fi @@ -113,7 +113,7 @@ if [ "$?" != "0" ]; then exit 1 fi -cp -f "$STATINGDIR/$site" "$DESTINATION/$site" +cp -f "$STAGINGDIR/$site" "$DESTINATION/$site" if grep -i include "$DESTINATION/$site" > /dev/null; then echo "New site may have include statements - rejecting." >&2