Makefile infrastructure

When generating the distribution files, prepare todo.sh
by subbing in the current version so that users will
get a proper version number.

Tries to detect VERSION-FILE for running from
the development directory but this doesn't work well
when $PWD is not the top of the git repo.

Signed-off-by: Emil Sit <sit@emilsit.net>

.gitignore

@@ -0,0 +1 @@
+VERSION-FILE

GEN-VERSION-FILE

@@ -0,0 +1,38 @@
+#!/bin/sh
+# Based on git's GIT-VERSION-GEN.
+
+VF=VERSION-FILE
+DEF_VER=v2.2
+
+LF='
+'
+
+if test -d .git -o -f .git &&
+	VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+	case "$VN" in
+	*$LF*) (exit 1) ;;
+	v[0-9]*)
+		git update-index -q --refresh
+		test -z "$(git diff-index --name-only HEAD --)" ||
+		VN="$VN-dirty" ;;
+	esac
+then
+	VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+	VN="$DEF_VER"
+fi
+
+VN=$(expr "$VN" : v*'\(.*\)')
+
+if test -r $VF
+then
+	VC=$(sed -e 's/^VERSION=//' <$VF)
+else
+	VC=unset
+fi
+test "$VN" = "$VC" || {
+	echo >&2 "VERSION=$VN"
+	echo "VERSION=$VN" >$VF
+}
+
+

Makefile

@@ -0,0 +1,34 @@
+#
+# Makefile for todo.txt
+#
+
+# Dynamically detect/generate version file as necessary
+# This file will define a variable called VERSION.
+.PHONY: .FORCE-VERSION-FILE
+VERSION-FILE: .FORCE-VERSION-FILE
+	@./GEN-VERSION-FILE
+-include VERSION-FILE
+
+# Maybe this will include the version in it.
+todo.sh: VERSION-FILE
+
+# For packaging
+DISTFILES := todo.cfg
+
+DISTNAME=todo.txt_cli-$(VERSION)
+dist: $(DISTFILES) todo.sh
+	mkdir -p $(DISTNAME)
+	cp -f $(DISTFILES) $(DISTNAME)/
+	sed -e 's/@DEV_VERSION@/'$(VERSION)'/' todo.sh > $(DISTNAME)/todo.sh
+	tar cf $(DISTNAME).tar $(DISTNAME)/
+	gzip -f -9 $(DISTNAME).tar
+	zip -9r $(DISTNAME).zip $(DISTNAME)/
+	rm -r $(DISTNAME)
+
+.PHONY: clean
+clean:
+	rm -f $(DISTNAME).tar.gz $(DISTNAME).zip
+
+.PHONY: test
+test:
+	@echo "TBD!"

README

@@ -1,111 +1,8 @@
-  Usage:  todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+    TODO.TXT Command Line Interface
-
+    Latest version: http://github.com/ginatrapani/todo.txt-cli/tree/master
-  Actions:
+    First release: 5/11/2006
-    add "THING I NEED TO DO +project @context" 
+    Conceived and released by: Gina Trapani (http://ginatrapani.org)
-    a "THING I NEED TO DO +project @context" 
+    Contributors: http://github.com/ginatrapani/todo.txt-cli/network
-      Adds THING I NEED TO DO to your todo.txt file on its own line.
+    License: GPL, http://www.gnu.org/copyleft/gpl.html
-      Project and context notation optional.
+    More information and mailing list at http://todotxt.com
-      Quotes optional.
+    To submit patches, fork the repository at http://github.com/ginatrapani/todo.txt-cli/tree/master
-
-    addto DEST "TEXT TO ADD"
-      Adds a line of text to any file located in the todo.txt directory.
-      For example, addto inbox.txt "decide about vacation"
-      
-    append NUMBER "TEXT TO APPEND"
-    app NUMBER "TEXT TO APPEND"
-      Adds TEXT TO APPEND to the end of the todo on line NUMBER.
-      Quotes optional.
-
-    archive
-      Moves done items from todo.txt to done.txt and removes blank lines.
-
-    del NUMBER [TERM]
-    rm NUMBER [TERM]
-      Deletes the item on line NUMBER in todo.txt.  
-      If term specified, deletes only the term from the line.
-
-    depri NUMBER 
-    dp NUMBER
-      Deprioritizes (removes the priority) from the item 
-	  on line NUMBER in todo.txt.  
-
-    do NUMBER
-      Marks item on line NUMBER as done in todo.txt.
-
-    list [TERM...] 
-    ls [TERM...]
-      Displays all todo's that contain TERM(s) sorted by priority with line
-      numbers.  If no TERM specified, lists entire todo.txt.
-
-    listall [TERM...]
-    lsa [TERM...]
-      Displays all the lines in todo.txt AND done.txt that contain TERM(s)
-      sorted by priority with line  numbers.  If no TERM specified, lists
-      entire todo.txt AND done.txt concatenated and sorted.
-
-    listcon
-    lsc
-      Lists all the task contexts that start with the @ sign in todo.txt.
-
-    listfile SRC [TERM...]
-    lf SRC [TERM...]
-      Displays all the lines in SRC file located in the todo.txt directory,
-      sorted by priority with line  numbers.  If TERM specified, lists
-      all lines that contain TERM in SRC file.
-
-    listpri [PRIORITY]
-    lsp [PRIORITY]
-      Displays all items prioritized PRIORITY.
-      If no PRIORITY specified, lists all prioritized items.
-
-    listproj
-    lsprj
-      Lists all the projects that start with the + sign in todo.txt.
-
-    move NUMBER DEST [SRC]
-    mv NUMBER DEST [SRC]
-      Moves a line from source text file (SRC) to destination text file (DEST).
-      Both source and destination file must be located in the directory defined
-      in the configuration directory.  When SRC is not defined 
-	  it's by default todo.txt.
-		
-    prepend NUMBER "TEXT TO PREPEND"
-    prep NUMBER "TEXT TO PREPEND"
-      Adds TEXT TO PREPEND to the beginning of the todo on line NUMBER.
-      Quotes optional.
-
-    pri NUMBER PRIORITY
-    p NUMBER PRIORITY
-      Adds PRIORITY to todo on line NUMBER.  If the item is already
-      prioritized, replaces current priority with new PRIORITY.
-      PRIORITY must be an uppercase letter between A and Z.
-
-    replace NUMBER "UPDATED TODO"
-      Replaces todo on line NUMBER with UPDATED TODO.
-
-    report
-      Adds the number of open todo's and closed done's to report.txt.
-
-  
- 
-  Options:
-    -d CONFIG_FILE
-        Use a configuration file other than the default ~/todo.cfg
-    -f
-        Forces actions without confirmation or interactive input
-    -h
-        Display this help message
-    -p
-        Plain mode turns off colors
-    -a
-        Don't auto-archive tasks automatically on completion
-    -n
-        Don't preserve line numbers; automatically remove blank lines 
-        on task deletion
-    -t
-        Prepend the current date to a task automatically
-	    when it's added.
-    -v 
-        Verbose mode turns on confirmation messages
-    -V 
-        Displays version, license and credits

todo.cfg

@@ -1,41 +1,41 @@
 # === EDIT FILE LOCATIONS BELOW ===
 
 # Your todo.txt directory
-#TODO_DIR="/Users/gina/Documents/todo"  
+#export TODO_DIR="/Users/gina/Documents/todo"
-TODO_DIR="C:/Documents and Settings/gina/My Documents"  
+export TODO_DIR="C:/Documents and Settings/gina/My Documents"
 
 # Your todo/done/report.txt locations
-TODO_FILE="$TODO_DIR/todo.txt"  
+export TODO_FILE="$TODO_DIR/todo.txt"
-DONE_FILE="$TODO_DIR/done.txt"  
+export DONE_FILE="$TODO_DIR/done.txt"
-REPORT_FILE="$TODO_DIR/report.txt" 
+export REPORT_FILE="$TODO_DIR/report.txt"
-TMP_FILE="$TODO_DIR/todo.tmp" 
+export TMP_FILE="$TODO_DIR/todo.tmp"
 
 # == EDIT FILE LOCATIONS ABOVE ===
 
 # === COLOR MAP ===
 
-NONE=''
+export NONE=''
-BLACK='\\033[0;30m'
+export BLACK='\\033[0;30m'
-RED='\\033[0;31m'
+export RED='\\033[0;31m'
-GREEN='\\033[0;32m'
+export GREEN='\\033[0;32m'
-BROWN='\\033[0;33m'
+export BROWN='\\033[0;33m'
-BLUE='\\033[0;34m'
+export BLUE='\\033[0;34m'
-PURPLE='\\033[0;35m'
+export PURPLE='\\033[0;35m'
-CYAN='\\033[0;36m'
+export CYAN='\\033[0;36m'
-LIGHT_GREY='\\033[0;37m'
+export LIGHT_GREY='\\033[0;37m'
-DARK_GREY='\\033[1;30m'
+export DARK_GREY='\\033[1;30m'
-LIGHT_RED='\\033[1;31m'
+export LIGHT_RED='\\033[1;31m'
-LIGHT_GREEN='\\033[1;32m'
+export LIGHT_GREEN='\\033[1;32m'
-YELLOW='\\033[1;33m'
+export YELLOW='\\033[1;33m'
-LIGHT_BLUE='\\033[1;34m'
+export LIGHT_BLUE='\\033[1;34m'
-LIGHT_PURPLE='\\033[1;35m'
+export LIGHT_PURPLE='\\033[1;35m'
-LIGHT_CYAN='\\033[1;36m'
+export LIGHT_CYAN='\\033[1;36m'
-WHITE='\\033[1;37m'
+export WHITE='\\033[1;37m'
-DEFAULT='\\033[0m'
+export DEFAULT='\\033[0m'
 
 # === PRIORITY COLORS ===
 
-PRI_A=$YELLOW   # color for A priority
+export PRI_A=$YELLOW   # color for A priority
-PRI_B=$GREEN  # color for B priority
+export PRI_B=$GREEN  # color for B priority
-PRI_C=$LIGHT_BLUE   # color for C priority
+export PRI_C=$LIGHT_BLUE   # color for C priority
-PRI_X=$WHITE   # color for rest of them
+export PRI_X=$WHITE   # color for rest of them

todo.sh

@@ -3,32 +3,67 @@
 # NOTE:  Todo.sh requires the todo.cfg configuration file to run.
 # Place the todo.cfg file in your home directory or use the -d option for a custom location.
 
+[ -f VERSION-FILE ] && . VERSION-FILE || VERSION="@DEV_VERSION@"
 version() { sed -e 's/^    //' <<EndVersion
-        TODO.TXT Manager
+        TODO.TXT Command Line Interface v$VERSION
-        Version 2.1
+        
-        Author:  Gina Trapani (ginatrapani@gmail.com)
+        First release: 5/11/2006
-        Last updated:  2/23/2009
+        Original conception by: Gina Trapani (http://ginatrapani.org)
-        Release date:  5/11/2006
+        Contributors: http://github.com/ginatrapani/todo.txt-cli/network
         License: GPL, http://www.gnu.org/copyleft/gpl.html
         More information and mailing list at http://todotxt.com
+        Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
 EndVersion
     exit 1
 }
 
+oneline_usage="todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
+
 usage()
 {
     sed -e 's/^    //' <<EndUsage
-    Usage: todo.sh  [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+    Usage: $oneline_usage
     Try 'todo.sh -h' for more information.
 EndUsage
     exit 1
 }
 
+shorthelp()
+{
+    sed -e 's/^    //' <<EndHelp
+      Usage: $oneline_usage
+
+      Actions:
+        add|a "THING I NEED TO DO +project @context"
+        addto DEST "TEXT TO ADD"
+        append|app NUMBER "TEXT TO APPEND"
+        archive
+        command [ACTIONS]
+        del|rm NUMBER [TERM]
+        dp|depri NUMBER
+        do NUMBER
+        help
+        list|ls [TERM...]
+        listall|lsa [TERM...]
+        listcon|lsc
+        listfile|lf SRC [TERM...]
+        listpri|lsp [PRIORITY]
+        listproj|lsprj
+        move|mv NUMBER DEST [SRC]
+        prepend|prep NUMBER "TEXT TO PREPEND"
+        pri|p NUMBER PRIORITY
+        replace NUMBER "UPDATED TODO"
+        report
+
+      See "help" for more details.
+EndHelp
+    exit 0
+}
 
 help()
 {
     sed -e 's/^    //' <<EndHelp
-      Usage:  todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+      Usage: $oneline_usage
 
       Actions:
         add "THING I NEED TO DO +project @context"
@@ -49,6 +84,10 @@ help()
         archive
           Moves done items from todo.txt to done.txt and removes blank lines.
 
+        command [ACTIONS]
+          Runs the remaining arguments using only todo.sh builtins.
+          Will not call any .todo.actions.d scripts.
+
         del NUMBER [TERM]
         rm NUMBER [TERM]
           Deletes the item on line NUMBER in todo.txt.
@@ -62,6 +101,9 @@ help()
         do NUMBER
           Marks item on line NUMBER as done in todo.txt.
 
+        help
+	  Display this help message.
+
         list [TERM...]
         ls [TERM...]
           Displays all todo's that contain TERM(s) sorted by priority with line
@@ -119,14 +161,23 @@ help()
 
 
       Options:
+        -@
+            Hide context names in list output. Use twice to show context
+            names (default).
+        -+
+            Hide project names in list output. Use twice to show project
+            names (default).
         -d CONFIG_FILE
             Use a configuration file other than the default ~/todo.cfg
         -f
             Forces actions without confirmation or interactive input
         -h
-            Display this help message
+            Display a short help message
         -p
             Plain mode turns off colors
+        -P
+            Hide priority labels in list output. Use twice to show
+            priority labels (default).
         -a
             Don't auto-archive tasks automatically on completion
         -n
@@ -137,8 +188,21 @@ help()
             when it's added.
         -v
             Verbose mode turns on confirmation messages
+        -vv
+            Extra verbose mode prints some debugging information
         -V
             Displays version, license and credits
+
+
+      Environment variables:
+        TODOTXT_AUTO_ARCHIVE=0          is same as option -a
+        TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
+        TODOTXT_FORCE=1                 is same as option -f
+        TODOTXT_PRESERVE_LINE_NUMBERS=0 is same as option -n
+        TODOTXT_PLAIN=1                 is same as option -p
+        TODOTXT_DATE_ON_ADD=1           is same as option -t
+        TODOTXT_VERBOSE=1               is same as option -v
+        TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
 EndHelp
 
     if [ -d "$HOME/.todo.actions.d" ]
@@ -174,53 +238,92 @@ archive()
 {
     #defragment blank lines
     sed -i.bak -e '/./!d' "$TODO_FILE"
-	[[ $VERBOSE = 1 ]] && grep "^x " "$TODO_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && grep "^x " "$TODO_FILE"
     grep "^x " "$TODO_FILE" >> "$DONE_FILE"
     sed -i.bak '/^x /d' "$TODO_FILE"
     cp "$TODO_FILE" "$TMP_FILE"
     sed -n 'G; s/\n/&&/; /^\([ -~]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
-	#[[ $VERBOSE = 1 ]] && echo "TODO: Duplicate tasks have been removed."
+    #[[ $TODOTXT_VERBOSE -gt 0 ]] && echo "TODO: Duplicate tasks have been removed."
-	[[ $VERBOSE = 1 ]] && echo "TODO:  $TODO_FILE archived."
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  $TODO_FILE archived."
     cleanup
 }
 
 
 # == PROCESS OPTIONS ==
-# defaults
+while getopts ":fhpnatvV+@Pd:" Option
-VERBOSE=1
-PLAIN=0
-CFG_FILE=$HOME/todo.cfg
-FORCE=0
-PRESERVE_LINE_NUMBERS=1
-AUTO_ARCHIVE=1
-DATE_ON_ADD=0
-
-while getopts ":fhpnatvVd:" Option
 do
   case $Option in
+    '@' )
+        ## HIDE_CONTEXT_NAMES starts at zero (false); increment it to one
+        ##   (true) the first time this flag is seen. Each time the flag
+        ##   is seen after that, increment it again so that an even
+        ##   number hides project names and an odd number shows project
+        ##   names.
+        : $(( HIDE_CONTEXT_NAMES++ ))
+        if [ $(( $HIDE_CONTEXT_NAMES % 2 )) -eq 0 ]
+        then
+            ## Zero or even value -- show context names
+            unset HIDE_CONTEXTS_SUBSTITUTION
+        else
+            ## One or odd value -- hide context names
+            export HIDE_CONTEXTS_SUBSTITUTION='[[:space:]]@[^[:space:]]\{1,\}'
+        fi
+        ;;
+    '+' )
+        ## HIDE_PROJECT_NAMES starts at zero (false); increment it to one
+        ##   (true) the first time this flag is seen. Each time the flag
+        ##   is seen after that, increment it again so that an even
+        ##   number hides project names and an odd number shows project
+        ##   names.
+        : $(( HIDE_PROJECT_NAMES++ ))
+        if [ $(( $HIDE_PROJECT_NAMES % 2 )) -eq 0 ]
+        then
+            ## Zero or even value -- show project names
+            unset HIDE_PROJECTS_SUBSTITUTION
+        else
+            ## One or odd value -- hide project names
+            export HIDE_PROJECTS_SUBSTITUTION='[[:space:]][+][^[:space:]]\{1,\}'
+        fi
+        ;;
     a )
-	AUTO_ARCHIVE=0
+        TODOTXT_AUTO_ARCHIVE=0
         ;;
     d )
-	CFG_FILE=$OPTARG
+        TODOTXT_CFG_FILE=$OPTARG
         ;;
     f )
-	FORCE=1
+        TODOTXT_FORCE=1
         ;;
     h )
-	help
+        shorthelp
         ;;
     n )
-	PRESERVE_LINE_NUMBERS=0
+        TODOTXT_PRESERVE_LINE_NUMBERS=0
         ;;
     p )
-	PLAIN=1 
+        TODOTXT_PLAIN=1
+        ;;
+    P )
+        ## HIDE_PRIORITY_LABELS starts at zero (false); increment it to one
+        ##   (true) the first time this flag is seen. Each time the flag
+        ##   is seen after that, increment it again so that an even
+        ##   number hides project names and an odd number shows project
+        ##   names.
+        : $(( HIDE_PRIORITY_LABELS++ ))
+        if [ $(( $HIDE_PRIORITY_LABELS % 2 )) -eq 0 ]
+        then
+            ## Zero or even value -- show priority labels
+            unset HIDE_PRIORITY_SUBSTITUTION
+        else
+            ## One or odd value -- hide priority labels
+            export HIDE_PRIORITY_SUBSTITUTION="([A-Z])[[:space:]]"
+        fi
         ;;
     t )
-	DATE_ON_ADD=1
+        TODOTXT_DATE_ON_ADD=1
         ;;
     v )
-	VERBOSE=1
+        : $(( TODOTXT_VERBOSE++ ))
         ;;
     V )
         version
@@ -229,31 +332,47 @@ do
 done
 shift $(($OPTIND - 1))
 
-[ -e "$CFG_FILE" ] || {
+# defaults if not yet defined
+TODOTXT_VERBOSE=${TODOTXT_VERBOSE:-1}
+TODOTXT_PLAIN=${TODOTXT_PLAIN:-0}
+TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/todo.cfg}
+TODOTXT_FORCE=${TODOTXT_FORCE:-0}
+TODOTXT_PRESERVE_LINE_NUMBERS=${TODOTXT_PRESERVE_LINE_NUMBERS:-1}
+TODOTXT_AUTO_ARCHIVE=${TODOTXT_AUTO_ARCHIVE:-1}
+TODOTXT_DATE_ON_ADD=${TODOTXT_DATE_ON_ADD:-0}
+TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-}
+
+[ -e "$TODOTXT_CFG_FILE" ] || {
     CFG_FILE_ALT="$HOME/.todo.cfg"
 
     if [ -e "$CFG_FILE_ALT" ]
     then
-	CFG_FILE="$CFG_FILE_ALT"
+        TODOTXT_CFG_FILE="$CFG_FILE_ALT"
     fi
 }
 
+export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD
+
+TODO_SH="$0"
+export TODO_SH
+
 # === SANITY CHECKS (thanks Karl!) ===
-[ -r "$CFG_FILE" ] || die "Fatal error:  Cannot read configuration file $CFG_FILE"
+[ -r "$TODOTXT_CFG_FILE" ] || die "Fatal error:  Cannot read configuration file $TODOTXT_CFG_FILE"
 
-. "$CFG_FILE"
+. "$TODOTXT_CFG_FILE"
 
-[ -z "$1" ]         && usage
+ACTION=${1:-$TODOTXT_DEFAULT_ACTION}
+
+[ -z "$ACTION" ]    && usage
 [ -d "$TODO_DIR" ]  || die "Fatal Error: $TODO_DIR is not a directory"
-cd "$TODO_DIR"      || die "Fatal Error: Unable to cd to $TODO_DIR"
+( cd "$TODO_DIR" )  || die "Fatal Error: Unable to cd to $TODO_DIR"
 
-echo '' > "$TMP_FILE" || die "Fatal Error:  Unable to write in $TODO_DIR"  
+[ -w "$TMP_FILE"  ] || echo -n > "$TMP_FILE" || die "Fatal Error:  Unable to write to $TMP_FILE"
 [ -f "$TODO_FILE" ] || cp /dev/null "$TODO_FILE"
 [ -f "$DONE_FILE" ] || cp /dev/null "$DONE_FILE"
 [ -f "$REPORT_FILE" ] || cp /dev/null "$REPORT_FILE"
 
-
+if [ $TODOTXT_PLAIN = 1 ]; then
-if [ $PLAIN = 1 ]; then
     PRI_A=$NONE
     PRI_B=$NONE
     PRI_C=$NONE
@@ -264,12 +383,138 @@ fi
 # === HEAVY LIFTING ===
 shopt -s extglob
 
-# == HANDLE ACTION ==
+_list() {
-action=$( printf "%s\n" "$1" | tr 'A-Z' 'a-z' )
+    local FILE="$1"
+    ## If the file starts with a "/" use absolute path. Otherwise, 
+    ## try to find it in either $TODO_DIR or using a relative path
+    if [ "${1:0:1}" == / ]
+    then
+        ## Absolute path
+        src="$FILE"
+    elif [ -f "$TODO_DIR/$FILE" ]
+    then
+        ## Path relative to todo.sh directory
+        src="$TODO_DIR/$1"
+    elif [ -f "$FILE" ]
+    then
+        ## Path relative to current working directory
+        src="$FILE"
+    else
+        echo "TODO: File $FILE does not exist."
+        exit 1
+    fi
 
+    ## Get our search arguments, if any
+    shift ## was file name, new $1 is first search term
+
+    ## Prefix the filter_command with the pre_filter_command
+    filter_command="${pre_filter_command:-}"
+
+    for search_term in "$@"
+    do
+        ## See if the first character of $search_term is a dash
+        if [ ${search_term:0:1} != '-' ]
+        then
+            ## First character isn't a dash: hide lines that don't match
+            ## this $search_term
+            filter_command="${filter_command:-} ${filter_command:+|} \
+                grep -i \"$search_term\" "
+        else
+            ## First character is a dash: hide lines that match this
+            ## $search_term
+            #
+            ## Remove the first character (-) before adding to our filter command
+            filter_command="${filter_command:-} ${filter_command:+|} \
+                grep -v -i \"${search_term:1}\" "
+        fi
+    done
+
+    ## If post_filter_command is set, append it to the filter_command
+    [ -n "$post_filter_command" ] && {
+        filter_command="${filter_command:-}${filter_command:+ | }${post_filter_command:-}"
+    }
+
+    ## Figure out how much padding we need to use
+    ## We need one level of padding for each power of 10 $LINES uses
+    LINES=$( sed -n '$ =' "$src" )
+    PADDING=${#LINES}
+
+    ## Number the file, then run the filter command,
+    ## then sort and mangle output some more
+    items=$(
+        sed = "$src"                                            \
+        | sed "N; s/^/     /; s/ *\(.\{$PADDING,\}\)\n/\1 /"    \
+	| grep -v "^[0-9]\+ *$"
+    )
+    if [ "${filter_command}" ]; then 
+        filtered_items=$(echo -ne "$items" | eval ${filter_command})
+    else
+        filtered_items=$items
+    fi
+    filtered_items=$(
+        echo -ne "$filtered_items"                              \
+        | sed '''
+            s/^     /00000/; 
+            s/^    /0000/;
+            s/^   /000/;
+            s/^  /00/;
+            s/^ /0/;
+          ''' \
+        | sort -f -k2                                           \
+        | sed '''
+            /^[0-9]\{'$PADDING'\} x /! {
+                s/\(.*(A).*\)/'$PRI_A'\1 '$DEFAULT'/g;
+                s/\(.*(B).*\)/'$PRI_B'\1 '$DEFAULT'/g;
+                s/\(.*(C).*\)/'$PRI_C'\1 '$DEFAULT'/g;
+                s/\(.*([D-Z]).*\)/'$PRI_X'\1 '$DEFAULT'/g;
+            }
+          '''                                                   \
+        | sed '''
+            s/'${HIDE_PRIORITY_SUBSTITUTION:-^}'//g
+            s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
+            s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
+          '''                                                   \
+    )
+    echo -ne "$filtered_items${filtered_items:+\n}"
+
+    if [ $TODOTXT_VERBOSE -gt 0 ]; then
+        NUMTASKS=$( echo -ne "$filtered_items" | sed -n '$ =' )
+        TOTALTASKS=$( echo -ne "$items" | sed -n '$ =' )
+
+        echo "--"
+        echo "TODO: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown from $FILE"
+    fi
+    if [ $TODOTXT_VERBOSE -gt 1 ]
+    then
+	echo "TODO DEBUG: Filter Command was: ${filter_command:-cat}"
+    fi
+}
+
+export -f _list
+
+# == HANDLE ACTION ==
+action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' )
+
+## If the first argument is "command", run the rest of the arguments
+## using todo.sh builtins.
+## Else, run a actions script with the name of the command if it exists
+## or fallback to using a builtin
+if [ "$action" == command ]
+then
+    ## Get rid of "command" from arguments list
+    shift
+    ## Reset action to new first argument
+    action=$( printf "%s\n" "$1" | tr 'A-Z' 'a-z' )
+elif [ -d "$HOME/.todo.actions.d" -a -x "$HOME/.todo.actions.d/$action" ]
+then
+    "$HOME/.todo.actions.d/$action" "$@"
+    cleanup
+fi
+
+## Only run if $action isn't found in .todo.actions.d
 case $action in
 "add" | "a")
-	if [[ -z "$2" && $FORCE = 0 ]]; then
+    if [[ -z "$2" && $TODOTXT_FORCE = 0 ]]; then
         echo -n "Add: "
         read input
     else
@@ -278,35 +523,27 @@ case $action in
         input=$*
     fi
 
-	
+    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
-	if [[ $DATE_ON_ADD = 1 ]]; then
         now=`date '+%Y-%m-%d'`
         input="$now $input"
     fi
-	
     echo "$input" >> "$TODO_FILE"
-	
+    TASKNUM=$(sed -n '$ =' "$TODO_FILE")
-
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added on line $TASKNUM."
-
-	TASKNUM=$(wc -l "$TODO_FILE" | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
-	[[ $VERBOSE = 1 ]] && echo "TODO: '$input' added on line $TASKNUM."
     cleanup;;
 
 "addto" )
     [ -z "$2" ] && die "usage: $0 addto DEST \"TODO ITEM\""
     dest="$TODO_DIR/$2"
-
     [ -z "$3" ] && die "usage: $0 addto DEST \"TODO ITEM\""
     shift
     shift
     input=$*
 
     if [ -f "$dest" ]; then
-	
         echo "$input" >> "$dest"
-
+        TASKNUM=$(sed -n '$ =' "$dest")
-		TASKNUM=$(wc -l "$dest" | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added to $dest on line $TASKNUM."
-		[[ $VERBOSE = 1 ]] && echo "TODO: '$input' added to $dest on line $TASKNUM."
     else
         echo "TODO:  Destination file $dest does not exist."
     fi
@@ -318,21 +555,17 @@ case $action in
 
     [ -z "$item" ] && die "$errmsg"
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
-	
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item:  No such todo."
-
+    if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
-
-	if [[ -z "$1" && $FORCE = 0 ]]; then
         echo -n "Append: "
         read input
     else
         input=$*
     fi
-
     if sed -i.bak $item" s|^.*|& $input|" "$TODO_FILE"; then
         newtodo=$(sed "$item!d" "$TODO_FILE")
-	        [[ $VERBOSE = 1 ]] && echo "$item: $newtodo"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
     else
         echo "TODO:  Error appending task $item."
     fi
@@ -342,7 +575,7 @@ case $action in
     archive;;
 
 "del" | "rm" )
-	# replace deleted line with a blank line when PRESERVE_LINE_NUMBERS is 1
+    # replace deleted line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
     errmsg="usage: $0 del ITEM#"
     item=$2
     [ -z "$item" ] && die "$errmsg"
@@ -353,24 +586,22 @@ case $action in
         if sed -ne "$item p" "$TODO_FILE" | grep "^."; then
             DELETEME=$(sed "$2!d" "$TODO_FILE")
 
-			if  [ $FORCE = 0 ]; then
+            if  [ $TODOTXT_FORCE = 0 ]; then
                 echo "Delete '$DELETEME'?  (y/n)"
                 read ANSWER
             else
                 ANSWER="y"
             fi
-			
             if [ "$ANSWER" = "y" ]; then
-		    	if [ $PRESERVE_LINE_NUMBERS = 0 ]; then
+                if [ $TODOTXT_PRESERVE_LINE_NUMBERS = 0 ]; then
                     # delete line (changes line numbers)
                     sed -i.bak -e $2"s/^.*//" -e '/./!d' "$TODO_FILE"
                 else
                     # leave blank line behind (preserves line numbers)
                     sed -i.bak -e $2"s/^.*//" "$TODO_FILE"
                 fi
-		    	[[ $VERBOSE = 1 ]] && echo "TODO:  '$DELETEME' deleted."
+                [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  '$DELETEME' deleted."
                 cleanup
-
             else
                 echo "TODO:  No tasks were deleted."
             fi
@@ -379,7 +610,7 @@ case $action in
         fi
     else
         sed -i.bak -e $item"s/$3/ /g"  "$TODO_FILE"
-		[[ $VERBOSE = 1 ]] && echo "TODO:  $3 removed from $item."
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  $3 removed from $item."
     fi ;;
 
 "depri" | "dp" )
@@ -396,8 +627,8 @@ case $action in
         #it's all good, continue
         sed -i.bak -e $2"s/^(.*) //" "$TODO_FILE"
         NEWTODO=$(sed "$2!d" "$TODO_FILE")
-		[[ $VERBOSE = 1 ]] && echo -e "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
-              [[ $VERBOSE = 1 ]] && echo "TODO: $item deprioritized."
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item deprioritized."
         cleanup
     else
         die "$errmsg"
@@ -417,93 +648,43 @@ case $action in
     sed -i.bak $item"s/^(.*) //" "$TODO_FILE"
     sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
     newtodo=$(sed "$item!d" "$TODO_FILE")
-	[[ $VERBOSE = 1 ]] && echo "$item: $newtodo"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
-	[[ $VERBOSE = 1 ]] && echo "TODO: $item marked as done."
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item marked as done."
 
-	if [ $AUTO_ARCHIVE = 1 ]; then
+    if [ $TODOTXT_AUTO_ARCHIVE = 1 ]; then
         archive
     fi
-
     cleanup ;;
 
+"help" )
+    help
+    ;;
 
 "list" | "ls" )
-	item=$2
+    shift  ## Was ls; new $1 is first search term
-	if [ -z "$item" ]; then
+    _list "$TODO_FILE" "$@"
-		echo -e "`sed = "$TODO_FILE" | sed 'N; s/^/  /; s/ *\(.\{2,\}\)\n/\1 /' | sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/'`"
-		echo "--"
-		NUMTASKS=$(wc -l "$TODO_FILE" | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
-		echo "TODO: $NUMTASKS tasks in $TODO_FILE."
-	else
-		command=`sed = "$TODO_FILE" | sed 'N; s/^/  /; s/ *\(.\{2,\}\)\n/\1 /' | sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/' | grep -i $item `
-		shift
-		shift
-		for i in $*
-			do
-			command=`echo "$command" | grep -i $i `
-			done
-		command=`echo "$command" | sort -f -k2`
 
-		echo -e "$command"
+    cleanup 
-	fi
+    ;;
-
-	cleanup ;;
 
 "listall" | "lsa" )
-	item=$2
+    shift  ## Was lsa; new $1 is first search term
+
     cat "$TODO_FILE" "$DONE_FILE" > "$TMP_FILE"
+    _list "$TMP_FILE" "$@"
 
-	if [ -z "$item" ]; then
+    cleanup 
-		echo -e "`sed = "$TMP_FILE" | sed 'N; s/^/  /; s/ *\(.\{3,\}\)\n/\1 /' | sed 's/^  /00/' | sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/'`"
+    ;;
-	else
-		command=`sed = "$TMP_FILE" | sed 'N; s/^/  /; s/ *\(.\{3,\}\)\n/\1 /' | sed 's/^  /00/' | sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/' | grep -i $item `
-		shift
-		shift
-		for i in $*
-			do
-			command=`echo "$command" | grep -i $i `
-			done
-		command=`echo "$command" | sort -f -k2`
-
-		echo -e "$command"
-	fi
-	cleanup ;;
-
 
 "listfile" | "lf" )
-	src="$TODO_DIR/$2"
+    shift  ## Was listfile, next $1 is file name
+    FILE="$1"
+    shift  ## Was filename; next $1 is first search term
 
-	if [ -z "$3" ]; then
+    _list "$FILE" "$@"
-		item=""
-	else
-		item=$3
-	fi
 
-   	if [ -f "$src" ]; then
+    cleanup 
-	if [ -z "$item" ]; then
+    ;;
-		echo -e "`sed = "$src" | sed 'N; s/^/  /; s/ *\(.\{2,\}\)\n/\1 /' | sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/'`"
-		if [ $VERBOSE = 1 ]; then
-			echo "--"
-			NUMTASKS=$( sed '/./!d' "$src" | wc -l | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
-			echo "TODO: $NUMTASKS lines in $src."
-		fi
-	else
-		command=`sed = "$src" | sed 'N; s/^/  /; s/ *\(.\{2,\}\)\n/\1 /' | sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/' | grep -i $item `
-		shift
-		shift
-		for i in $*
-			do
-			command=`echo "$command" | grep -i $i `
-			done
-		command=`echo "$command" | sort -f -k2`
-
-		echo -e "$command"
-	fi
-	else
- 		echo "TODO: File $src does not exist."
-
-	fi
-	cleanup ;;
 
 "listcon" | "lsc" )
     gawk '{for(i = 1; i <= NF; i++) print $i}' "$TODO_FILE" | grep '@' | sort | uniq
@@ -515,43 +696,32 @@ case $action in
 
 
 "listpri" | "lsp" )
-	pri=$( printf "%s\n" "$2" | tr 'a-z' 'A-Z' )
+    shift ## was "listpri", new $1 is priority to list
 
-	errmsg="usage: $0 listpri PRIORITY  
+    if [ "${1:-}" ]
-note:  PRIORITY must a single letter from A to Z."
+    then
-
+        ## A priority was specified
-	if [ -z "$pri" ]; then
+        pri=$( printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$' ) || {
-		echo -e "`sed = "$TODO_FILE" | sed 'N; s/^/  /; s/ *\(.\{2,\}\)\n/\1 /' | sed 's/^ /0/' | sort -f -k2 |  sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/'`" | grep \([A-Z]\)
+	    die "usage: $0 listpri PRIORITY
-		if [ $VERBOSE = 1 ]; then
+	    note:  PRIORITY must a single letter from A to Z."
-			echo "--"
+        }
-			NUMTASKS=$(grep \([A-Z]\) "$TODO_FILE" | wc -l | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
-			echo "TODO: $NUMTASKS prioritized tasks in $TODO_FILE."
-		fi
     else
-		[[ "$pri" = +([A-Z]) ]] || die "$errmsg"
+        ## No priority specified; show all priority tasks
-
+        pri="[[:upper:]]"
-		echo -e "`sed = "$TODO_FILE" | sed 'N; s/^/  /; s/ *\(.\{2,\}\)\n/\1 /' | sed 's/^ /0/' |  sort -f -k2 |  sed 's/^ /0/' | sort -f -k2 | sed '/^[0-9][0-9] x /!s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g' | sed '/^[0-9][0-9] x /!s/\(.*([A-Z]).*\)/'$PRI_X'\1'$DEFAULT'/'`" | grep \($pri\)
-		if [ $VERBOSE = 1 ]; then
-			echo "--"
-			NUMTASKS=$(grep \($pri\) "$TODO_FILE" | wc -l | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
-			echo "TODO: $NUMTASKS tasks prioritized $pri in $TODO_FILE."
     fi
+    pri="($pri)"
 
-	fi
+    _list "$TODO_FILE" "$pri"
-	cleanup;;
+    ;;
 
 "move" | "mv" )
-
+    # replace moved line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-	# replace moved line with a blank line when PRESERVE_LINE_NUMBERS is 1
     errmsg="usage: $0 mv ITEM# DEST [SRC]"
-	
     item=$2
     dest="$TODO_DIR/$3"
-
     src="$TODO_DIR/$4"
 
     [ -z "$item" ] && die "$errmsg"
-
     [ -z "$4" ] && src="$TODO_FILE"
     [ -z "$dest" ] && die "$errmsg"
 
@@ -559,19 +729,16 @@ note:  PRIORITY must a single letter from A to Z."
 
     if [ -f "$src" ]; then
         if [ -f "$dest" ]; then
-
             if sed -ne "$item p" "$src" | grep "^."; then
                 MOVEME=$(sed "$item!d" "$src")
-		
+                if  [ $TODOTXT_FORCE = 0 ]; then
-		if  [ $FORCE = 0 ]; then
                     echo "Move '$MOVEME' from $src to $dest? (y/n)"
                     read ANSWER
                 else
                     ANSWER="y"
                 fi
-			
                 if [ "$ANSWER" = "y" ]; then
-		   	if [ $PRESERVE_LINE_NUMBERS = 0 ]; then
+                    if [ $TODOTXT_PRESERVE_LINE_NUMBERS = 0 ]; then
                         # delete line (changes line numbers)
                         sed -i.bak -e $item"s/^.*//" -e '/./!d' "$src"
                     else
@@ -580,16 +747,14 @@ note:  PRIORITY must a single letter from A to Z."
                     fi
                     echo "$MOVEME" >> "$dest"
 
-		    [[ $VERBOSE = 1 ]] && echo "TODO:  '$MOVEME' moved from '$src' to '$dest'."
+                    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  '$MOVEME' moved from '$src' to '$dest'."
                     cleanup
-
                 else
                     echo "TODO:  No tasks moved."
                 fi
             else
                 echo "$item: No such item in $src."
             fi
-   	
         else
             echo "TODO:  Destination file $dest does not exist."
         fi
@@ -605,11 +770,10 @@ note:  PRIORITY must a single letter from A to Z."
     [ -z "$item" ] && die "$errmsg"
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
 
-	
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item:  No such todo."
 
-	if [[ -z "$1" && $FORCE = 0 ]]; then
+    if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
         echo -n "Prepend: "
         read input
     else
@@ -618,7 +782,7 @@ note:  PRIORITY must a single letter from A to Z."
 
     if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
         newtodo=$(sed "$item!d" "$TODO_FILE")
-	        [[ $VERBOSE = 1 ]] && echo "$item: $newtodo"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
     else
         echo "TODO:  Error prepending task $item."
     fi
@@ -641,8 +805,8 @@ note:  PRIORITY must be anywhere from A to Z."
         #it's all good, continue
         sed -i.bak -e $2"s/^(.*) //" -e $2"s/^/($newpri) /" "$TODO_FILE"
         NEWTODO=$(sed "$2!d" "$TODO_FILE")
-		[[ $VERBOSE = 1 ]] && echo -e "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
-              [[ $VERBOSE = 1 ]] && echo "TODO: $item prioritized ($newpri)."
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item prioritized ($newpri)."
         cleanup
     else
         die "$errmsg"
@@ -658,8 +822,7 @@ note:  PRIORITY must be anywhere from A to Z."
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item:  No such todo."
 
-		
+    if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
-	if [[ -z "$1" && $FORCE = 0 ]]; then
         echo -n "Replacement: "
         read input
     else
@@ -667,9 +830,9 @@ note:  PRIORITY must be anywhere from A to Z."
     fi
 
     sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
-	[[ $VERBOSE = 1 ]] && NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
+    [ $TODOTXT_VERBOSE -gt 0 ] && NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
-	[[ $VERBOSE = 1 ]] && echo "replaced with"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "replaced with"
-	[[ $VERBOSE = 1 ]] && echo "$item: $NEWTODO"
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $NEWTODO"
     cleanup;;
 
 "report" )
@@ -677,30 +840,21 @@ note:  PRIORITY must be anywhere from A to Z."
     sed '/^x /!d' "$TODO_FILE" >> "$DONE_FILE"
     sed -i.bak '/^x /d' "$TODO_FILE"
 
-    NUMLINES=$(wc -l "$TODO_FILE" | sed 's/^[[:space:]]*\([0-9]*\).*/\1/')
+    NUMLINES=$( sed -n '$ =' "$TODO_FILE" )
-    if [ $NUMLINES = "0" ]; then
+    if [ ${NUMLINES:-0} = "0" ]; then
          echo "datetime todos dones" >> "$REPORT_FILE"
     fi
     #now report
-	TOTAL=$(cat "$TODO_FILE" | wc -l | sed 's/^[ \t]*//')
+    TOTAL=$( sed -n '$ =' "$TODO_FILE" )
-	TDONE=$(cat "$DONE_FILE" | wc -l | sed 's/^[ \t]*//')
+    TDONE=$( sed -n '$ =' "$DONE_FILE" )
-	TECHO=$(echo $(date +%Y-%m-%d-%T); echo ' '; echo $TOTAL; echo ' ';
+    TECHO=$(echo $(date +%Y-%m-%d-%T); echo ' '; echo ${TOTAL:-0}; echo ' ';
-	echo $TDONE)
+    echo ${TDONE:-0})
     echo $TECHO >> "$REPORT_FILE"
-	[[ $VERBOSE = 1 ]] && echo "TODO:  Report file updated."
+    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO:  Report file updated."
     cat "$REPORT_FILE"
     cleanup;;
+
 * )
     usage
-	if [ -d "$HOME/.todo.actions.d" ]
+    ;;
-	then
-		if [ -x "$HOME/.todo.actions.d/$action" ]
-		then
-			CFG_FILE="$CFG_FILE" "$HOME/.todo.actions.d/$action" "$@"
-		else
-			usage
-		fi
-	else
-		usage
-	fi
 esac