Use '--config' instead of '--config-file'.

Author: Matt Pearson

arg-parsing-test.bats

@@ -28,7 +28,7 @@ write_env_file() {
 }
 
 write_conf_file() {
-	# Write a config-file to override '.env'.
+	# Write a configuration file to override '.env'.
 	cat <<-EOF > conf
 		GIT_DEPLOY_APPEND_HASH=conf-file
 	EOF
@@ -59,7 +59,7 @@ write_conf_file() {
 	write_env_file
 	write_conf_file
 
-	parse_args --config-file conf
+	parse_args --config conf
 	assert that "$append_hash" = "conf-file"
 }
 
@@ -68,7 +68,7 @@ write_conf_file() {
 	write_env_file
 	write_conf_file
 
-	parse_args --config-file conf --no-hash
+	parse_args --config conf --no-hash
 	assert that "$append_hash" = "false"
 }
 @test '        sets a commit message with spaces in it.' {

deploy.sh

@@ -15,7 +15,7 @@ Options:
                            deploy branch.
   -n, --no-hash            Don't append the source commit's hash to the deploy
                            commit's message.
-  -c, --config-file PATH   Override default & environment variables' values
+  -c, --config PATH        Override default & environment variables' values
                            with those in set in the file at 'PATH'. Must be the
                            first option specified.
 
@@ -28,7 +28,7 @@ Variables:
 These variables have default values defined in the script. The defaults can be
 overridden by environment variables. Any environment variables are overridden
 by values set in a '.env' file (if it exists), and in turn by those set in a
-file specified by the '--config-file' option.
+file specified by the '--config' option.
 
 Positional Args:
 
@@ -44,7 +44,7 @@ parse_args() {
 	fi
 
 	# Set args from file specified on the command-line.
-	if [[ $1 = "-c" || $1 = "--config-file" ]]; then
+	if [[ $1 = "-c" || $1 = "--config" ]]; then
 		source "$2"
 		shift 2
 	fi

readme.md

@@ -42,7 +42,7 @@ Do this every time you want to deploy, or have your CI server do it.
 
 `-h`, `--help`: show the program's help info.
 
-`-c`, `--config-file`: specify a file that overrides the script's default configuration, or those values set in `.env`. The syntax for this file should be normal `var=value` declarations. __This option _must_ come first on the command-line__.
+`-c`, `--config`: specify a file that overrides the script's default configuration, or those values set in `.env`. The syntax for this file should be normal `var=value` declarations. __This option _must_ come first on the command-line__.
 
 `-m`, `--message <message>`: specify message to be used for the commit on `deploy_branch`. By default, the message is the title of the source commit, prepended with 'publish: '.