fix a few typos and run one of the setup scripts with sudo

Author: vthunder

README.md

@@ -7,12 +7,16 @@ directory. On a fresh Ubuntu 12 server, you should only need to run
 <code>scripts/bootstrap.sh</code>, which calls other scripts to set
 most things up. See below for some details on the other scripts.
 
-You'll still need to manually configure a few things:
+Note that one of the scripts is run with sudo. If you don't have sudo
+enabled for this user, then you'll need to run the scripts manually.
+
+Regardless of how you run the setup scripts, you'll still need to
+manually configure a few things:
 
 1. Edit <code>docroot/wp-config-local.php</code> and fill in values as
    needed by WordPress.
 2. Set up SSL keys in /etc/ssl/*
-3. Edit /etc/apache2/sites-available/<hostname> if needed (e.g. to
+3. Edit /etc/apache2/sites-available/(hostname) if needed (e.g. to
    change SSL key locations)
 4. Load DB data from another WordPress install (see below)
 

scripts/bootstrap.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-function usage() {
+function usage {
     echo "Usage: $0 <hostname> <db> <dbuser>"
     exit 1
 }
@@ -13,6 +13,6 @@ DBUSER=${3}
 
 TOPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}/.." )" && pwd )"
 
-${TOPDIR}/scripts/bootstrap_server_ubuntu.sh
+sudo ${TOPDIR}/scripts/bootstrap_server_ubuntu.sh
 ${TOPDIR}/scripts/bootstrap_mysql.sh "${DB}" "${DBUSER}"
 ${TOPDIR}/scripts/bootstrap_checkout.sh

scripts/bootstrap_mysql.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-function usage() {
+function usage {
     echo "Usage: $0 <new-database> <new-user>"
     exit 1
 }