Use environment variables in config. files.

This is instead of setting the script's private variables directly.

We need to `source .env` before setting in-script defaults. If an
environment variable is defined in `.env`, it will then still
override the script's defaults.

Author: Matt Pearson

deploy.sh

@@ -2,6 +2,11 @@
 set -o errexit #abort if any command fails
 
 main() {
+	# Set args from a local environment file.
+	if [ -e ".env" ]; then
+		source .env
+	fi
+
 	deploy_directory=${GIT_DEPLOY_DIR:-dist}
 	deploy_branch=${GIT_DEPLOY_BRANCH:-gh-pages}
 
@@ -14,11 +19,6 @@ main() {
 
 	#append commit hash to the end of message by default
 	append_hash=true
-	
-	# Set args from a local env file
-	if [ -e ".env" ]; then
-		source .env
-	fi
 
 	# Parse arg flags
 	while : ; do

readme.md

@@ -12,13 +12,20 @@ Download the script (`wget https://github.com/X1011/git-directory-deploy/raw/mas
 - **default_username**, **default_email**: identity to use for git commits if none is set already. Useful for CI servers.
 - **repo**: repository to deploy to. Must be readable and writable. The default of "origin" will not work on Travis CI, since it uses the read-only git protocol. In that case, it is recommended to store a [GitHub token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) in a [secure environment variable](http://docs.travis-ci.com/user/environment-variables/#Secure-Variables) and use it in an HTTPS URL like this: <code>repo=https://$GITHUB_TOKEN@github\.com/<i>user</i>/<i>repo</i>.git</code> **Warning: there is currently [an issue](https://github.com/X1011/git-directory-deploy/issues/7) where the repo URL may be output if an operation fails.**
 
-You can also define any of variables in configuration files. The script will set variables from these sources in this order:
+You can also define any of variables using environment variables and configuration files:
+
+- `GIT_DEPLOY_DIR`
+- `GIT_DEPLOY_BRANCH`
+- `GIT_DEPLOY_REPO`
+
+The script will set these variables in this order of preference:
 
 1. Defaults set in the script itself.
+* Environment variables.
 * `.env` file in the path where you're running the script.
 * File specified on the command-line (see the `-c` option below).
 
-Whatever values set later in this timeline will override those set earlier.
+Whatever values set later in this list will override those set earlier.
 
 ## run
 Do this every time you want to deploy, or have your CI server do it.