Whitespace cleanup.

beporter · beporter · commit e3f700743a83 · 2014-06-20T09:40:28.000-06:00
diff --git a/bin-selfupdate b/bin-selfupdate
@@ -5,15 +5,15 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Runs the necessary local commands to switch branches and/or 
-    update the bin/ submodule repo to the latest release. Afterwards, 
+${0##*/}
+    Runs the necessary local commands to switch branches and/or
+    update the bin/ submodule repo to the latest release. Afterwards,
     you should commit the changes in the parent project's repo.
 
 Usage:
     bin/${0##*/} [branch]
-    
-    Provide an optional branch from the CakePHP-Shell-Scripts repo 
+
+    Provide an optional branch from the CakePHP-Shell-Scripts repo
     you'd like to use. Defaults to 'master' for Cake 2+.
 
 
@@ -25,7 +25,6 @@ if [ "$1" = '-h' ]; then
 	usage
 fi
 
-
 DIR="$( cd -P "$( dirname "$0" )"/.. >/dev/null 2>&1 && pwd )"
 BIN_DIR="$DIR/bin"
 
@@ -56,5 +55,5 @@ if [ $? -gt 0 ]; then
 	exit 1    # Exits non-zero updates had to be applied.
 else
 	echo "## No changes to apply to the bin/ submodule."
-	exit 0 
+	exit 0
 fi
diff --git a/clear-cache b/clear-cache
@@ -5,9 +5,9 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Clears files from known Cake tmp directories. In particular, 
-    should be run after database schema changes. Should be run 
+${0##*/}
+    Clears files from known Cake tmp directories. In particular,
+    should be run after database schema changes. Should be run
     from the project root folder.
 
 Usage:
diff --git a/clear-logs b/clear-logs
@@ -5,9 +5,9 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
+${0##*/}
     Clears files from Cake's logs directory. Really only needed to
-    recover disk space from aggressive logs. Should be run 
+    recover disk space from aggressive logs. Should be run
     from the project root folder.
 
 Usage:
diff --git a/db-backup b/db-backup
@@ -7,11 +7,11 @@ function usage()
 	$script = basename(__FILE__);
 	echo <<<EOT
 
-${script}  
-    Uses the Config/database.php file to execute a mysqldump of the 
-    default database into a ZIP file located in a backups/ folder 
-    created in the project root (if necessary). Outputs the ZIP 
-    file's size as a crude verification step. Should be run from 
+${script}
+    Uses the Config/database.php file to execute a mysqldump of the
+    default database into a ZIP file located in a backups/ folder
+    created in the project root (if necessary). Outputs the ZIP
+    file's size as a crude verification step. Should be run from
     the project root folder.
 
 Usage:
diff --git a/db-credentials b/db-credentials
@@ -9,7 +9,7 @@
 $dir = dirname(dirname(__FILE__));
 $dbConfigFile = $dir . '/Config/database.php';
 include $dbConfigFile;
-$db = new DATABASE_CONFIG(); 
+$db = new DATABASE_CONFIG();
 
 echo <<<EOD
 DB_HOST="{$db->default['host']}"
diff --git a/db-loadschema b/db-loadschema
@@ -5,9 +5,9 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Determines the active schema management tool in use (CakeDC 
-    Migrations plugin, Cake Schema Shell, or old-fashioned schema.sql 
+${0##*/}
+    Determines the active schema management tool in use (CakeDC
+    Migrations plugin, Cake Schema Shell, or old-fashioned schema.sql
     file) and attempts to load the schema into the default database.
     Should be run from the project root folder.
 
diff --git a/db-login b/db-login
@@ -5,8 +5,8 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Uses Cake's Config/database.php file to start a command line 
+${0##*/}
+    Uses Cake's Config/database.php file to start a command line
     mysql session with the correct host, database, user and password.
     Should be run from the project root folder.
 
@@ -38,4 +38,4 @@ elif [ -n "${DB_PASS}" ]; then
 	${CMD} -p${DB_PASS}
 else
 	${CMD}
-fi
+fi
diff --git a/db-showupdates b/db-showupdates
@@ -5,14 +5,14 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Takes at least one git commit SHA hash and compares the 
-    Config/sql/db_updates.sql file in older (non-Migrations) projects 
-    to either the second commit SHA if provided, or the "HEAD" commit. 
-    The output is the difference between the files. Practically, this 
-    will be any SQL commands added to the bottom of the file, 
-    indicating they need to be applied to the local database. Used by 
-    bin/update to warn the user about DB changes before proceeding 
+${0##*/}
+    Takes at least one git commit SHA hash and compares the
+    Config/sql/db_updates.sql file in older (non-Migrations) projects
+    to either the second commit SHA if provided, or the "HEAD" commit.
+    The output is the difference between the files. Practically, this
+    will be any SQL commands added to the bottom of the file,
+    indicating they need to be applied to the local database. Used by
+    bin/update to warn the user about DB changes before proceeding
     with a git pull. Should be run from the project root folder.
 
 Usage:
diff --git a/email b/email
@@ -5,12 +5,14 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Provides a simplified interface for sending email from the local system.
+${0##*/}
+    Provides a simplified interface for sending email from the local
+    system, with the goal of being able to fail gracefully when the
+    \`mail\` executable is not available.
 
 Usage:
     bin/${0##*/} <emailAddress> <subject> <msgBodyFile>
-    
+
     - emailAddress: The email address to which to send the message.
     - subject: The subject line to use for the message.
     - msgBodyFile: The full path to the text file containing the message body.
diff --git a/git-currentbranch b/git-currentbranch
@@ -8,8 +8,9 @@ usage ()
 ${0##*/}
     Echoes the name of the currently checked-out git branch. Exits
     with a non-zero code when run in a non-git directory. The output
-    of this script can be captured into a variable in another script using the following:
-    
+    of this script can be captured into a variable in another script
+    using the following:
+
     BRANCH=\$(bin/git-currentbranch)
 
 Usage:
diff --git a/git-localchanges b/git-localchanges
@@ -5,10 +5,10 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Convenience wrapper to determine if there are any uncomitted changes 
-    to the local working copy that would disrupt a git pull. Exits 0 
-    if the working directory is clean. If there are differences, prints 
+${0##*/}
+    Convenience wrapper to determine if there are any uncomitted changes
+    to the local working copy that would disrupt a git pull. Exits 0
+    if the working directory is clean. If there are differences, prints
     a summary of the uncommited changes and exits 1.
 
 Usage:
diff --git a/git-remotechanges b/git-remotechanges
@@ -5,17 +5,17 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    For the git repo in the current working directory, will fetch 
-    any updates from origin and exit 0 if there are no changes, 
-    and 1 if there are. Useful for determining whether to proceed 
+${0##*/}
+    For the git repo in the current working directory, will fetch
+    any updates from origin and exit 0 if there are no changes,
+    and 1 if there are. Useful for determining whether to proceed
     with a task or not.
 
 Usage:
     bin/${0##*/} [ref]
-    
-    Takes an optional ref name to use when comparing against the local copy 
-    of the remote repo. Defaults to 'master'.
+
+    Takes an optional ref name to use when comparing against the
+    local copy of the remote repo. Defaults to 'master'.
 
 
 EOT
diff --git a/git-submodules b/git-submodules
@@ -5,8 +5,8 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Convenience wrapper to initialize and update all git submodules. 
+${0##*/}
+    Convenience wrapper to initialize and update all git submodules.
     Should be run from the project root folder.
 
 Usage:
diff --git a/migrations b/migrations
@@ -5,10 +5,10 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Convenience wrapper to run any pending Migrations. Takes an optional 
-    Migrations COMMAND (defaults to "run all") and an optional plugin 
-    for which to execute migrations. Should be run from the project 
+${0##*/}
+    Convenience wrapper to run any pending Migrations. Takes an optional
+    Migrations COMMAND (defaults to "run all") and an optional plugin
+    for which to execute migrations. Should be run from the project
     root folder.
 
 Usage:
diff --git a/paths b/paths
@@ -5,26 +5,26 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Provides a consistent way of fetching common Cake folder paths, 
-    even when they differ between Cake versions. Used by all of the 
-    other scripts to set paths that are correct for the project's 
-    current Cake version. 
-    
-    @TODO: Do something neat to determine the Cake version and paths. 
-    Maybe cheat by partially bootstraping Cake itself and getting 
+${0##*/}
+    Provides a consistent way of fetching common Cake folder paths,
+    even when they differ between Cake versions. Used by all of the
+    other scripts to set paths that are correct for the project's
+    current Cake version.
+
+    @TODO: Do something neat to determine the Cake version and paths.
+    Maybe cheat by partially bootstraping Cake itself and getting
     the PHP define()s???
-    
-    Takes a single argument representing a "shortcut" name for the 
-    path (really a lookup key). Returns the proper RELATIVE path 
+
+    Takes a single argument representing a "shortcut" name for the
+    path (really a lookup key). Returns the proper RELATIVE path
     for the current project.
-    
+
     For example:
     	bin/${0##*/} config -> app/config/ (for a Cake 1.x project)
     	                    -> Config/ (for a Cake 2.x project)
-    
+
     Other scripts can access this information like so:
-    	CONFIG_DIR=$( bin/paths config )
+		CONFIG_DIR=$( bin/paths config )
 
 Usage:
     bin/${0##*/} [local/path]
diff --git a/rename-empty b/rename-empty
@@ -5,10 +5,10 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Recursively renames any files named "empty" to '.gitkeep". If you do 
-    not want to act on the entire git root directory, pass in a local 
-    path as the first argument. Should be run from the project root 
+${0##*/}
+    Recursively renames any files named "empty" to '.gitkeep". If you do
+    not want to act on the entire git root directory, pass in a local
+    path as the first argument. Should be run from the project root
     folder.
 
 Usage:
diff --git a/set-owner b/set-owner
@@ -5,10 +5,10 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Sets the filesystem owner and group recursively from the project 
-    root folder. Uses the provided command line arguments if present, 
-    otherwise defaults to the owner and group set for the project 
+${0##*/}
+    Sets the filesystem owner and group recursively from the project
+    root folder. Uses the provided command line arguments if present,
+    otherwise defaults to the owner and group set for the project
     root folder. Should be run from the project root folder.
 
 Usage:
diff --git a/symlink-cake-core b/symlink-cake-core
@@ -5,10 +5,10 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Creates a symlink for the current project to the provided Cake 
-    core as Lib/Cake, provided a real Cake core isn't present. 
-    Overwrites an existing symlink if present. Should be run from 
+${0##*/}
+    Creates a symlink for the current project to the provided Cake
+    core as Lib/Cake, provided a real Cake core isn't present.
+    Overwrites an existing symlink if present. Should be run from
     the project root folder.
 
 Usage:
@@ -55,7 +55,7 @@ fi
 
 # Check to make sure the parent directory (Lib/) exists. (New projects might not have it unless there is already a .gitkeep file inside!)
 DIR_PARENT=$( dirname "${CORE_LINK}" )
-		
+
 if [ ! -d "${DIR_PARENT}" ]; then
 	echo "## Creating missing parent directory: ${DIR_PARENT}"
 	mkdir -p ${DIR_PARENT}
diff --git a/updatewritedirs b/updatewritedirs
@@ -5,8 +5,8 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Scans the project's directory structure for writeable directories, 
+${0##*/}
+    Scans the project's directory structure for writeable directories,
     and merges what it finds into the writedirs.txt configuration file.
 	Should be run from the project root folder.
 
diff --git a/writedirs b/writedirs
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
-# 
 #
 #  beporter@users.sourceforge.net
 
@@ -9,11 +8,11 @@ usage ()
 {
 	cat <<EOT
 
-${0##*/}  
-    Looks for a local file called writedirs.txt and attempts to make 
-    the list of directories it contains writable recursively. If it 
-    fails to find or read that file, or if it is empty, it will fall 
-    back to setting the tmp/ dir as writeable. Should be run from 
+${0##*/}
+    Looks for a local file called writedirs.txt and attempts to make
+    the list of directories it contains writable recursively. If it
+    fails to find or read that file, or if it is empty, it will fall
+    back to setting the tmp/ dir as writeable. Should be run from
     the project root folder.
 
 Usage:
