Merge branch 'master' of github.com:jomo/imgur-screenshot

Author: jomo

imgur-screenshot.sh

@@ -392,7 +392,7 @@ while [ ${#} != 0 ]; do
   case "${1}" in
   -h | --help)
     echo "usage: ${0} [--debug] [-c | --check | -v | -h | -u]"
-    echo "       ${0} [--debug] [optiion]... [file]..."
+    echo "       ${0} [--debug] [option]... [file]..."
     echo ""
     echo "      --debug                  Enable debugging, must be first option"
     echo "  -h, --help                   Show this help, exit"
@@ -401,6 +401,7 @@ while [ ${#} != 0 ]; do
     echo "  -c, --connect                Show connected imgur account, exit"
     echo "  -o, --open <true|false>      Override 'open' config"
     echo "  -e, --edit <true|false>      Override 'edit' config"
+    echo "  -i, --edit-command <command> Override 'edit_command' config (include '%img'), sets --edit 'true'"
     echo "  -l, --login <true|false>     Override 'login' config"
     echo "  -a, --album <album_title>    Create new album and upload there"
     echo "  -A, --album-id <album_id>    Override 'album_id' config"
@@ -427,6 +428,10 @@ while [ ${#} != 0 ]; do
   -e | --edit)
     edit="${2}"
     shift 2;;
+  -i | --edit-command)
+    edit_command="${2}"
+    edit="true"
+    shift 2;;
   -l | --login)
     login="${2}"
     shift 2;;