flo/todo.txt-cli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed backquotes to use $() instead.

Browse Source 
$(...) has superceded the `...` notation.  This can be found by
searching in Google "command substitution superseded"

Closes #28
This commit is contained in:
Archimedes Trajano
2011-02-16 03:37:04 -05:00
committed by Gina Trapani
parent dae6f2bcaf
commit e24777fa2c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
todo.sh
View File

@@ -269,14 +269,14 @@ cleaninput()
{ {
# Cleanup the input # Cleanup the input
# Replace newlines with spaces Always # Replace newlines with spaces Always
input=`echo $input | tr -d '\r\n'` input=$(echo $input | tr -d '\r\n')
action_regexp="^\(append\|app\|prepend\|prep\|replace\)$" action_regexp="^\(append\|app\|prepend\|prep\|replace\)$"
# Check which action we are being used in as this affects what cleaning we do # Check which action we are being used in as this affects what cleaning we do
if [ `echo $action | grep -c $action_regexp` -eq 1 ]; then if [ $(echo $action | grep -c $action_regexp) -eq 1 ]; then
# These actions use sed and & as the matched string so escape it # These actions use sed and & as the matched string so escape it
input=`echo $input | sed 's/\&/\\\&/g'` input=$(echo $input | sed 's/\&/\\\&/g')
fi fi
} }
@@ -531,7 +531,7 @@ export SENTENCE_DELIMITERS=',.:;'
} }
[ -e "$TODOTXT_CFG_FILE" ] || { [ -e "$TODOTXT_CFG_FILE" ] || {
CFG_FILE_ALT=`dirname "$0"`"/todo.cfg" CFG_FILE_ALT=$(dirname "$0")"/todo.cfg"
if [ -e "$CFG_FILE_ALT" ] if [ -e "$CFG_FILE_ALT" ]
then then
@@ -618,7 +618,7 @@ _addto() {
cleaninput $input cleaninput $input
if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
now=`date '+%Y-%m-%d'` now=$(date '+%Y-%m-%d')
input="$now $input" input="$now $input"
fi fi
echo "$input" >> "$file" echo "$input" >> "$file"
@@ -916,7 +916,7 @@ case $action in
# Split multiple depri's, if comma separated change to whitespace separated # Split multiple depri's, if comma separated change to whitespace separated
# Loop the 'depri' function for each item # Loop the 'depri' function for each item
for item in `echo $* | tr ',' ' '`; do for item in $(echo $* | tr ',' ' '); do
[[ "$item" = +([0-9]) ]] || die "$errmsg" [[ "$item" = +([0-9]) ]] || die "$errmsg"
todo=$(sed "$item!d" "$TODO_FILE") todo=$(sed "$item!d" "$TODO_FILE")
[ -z "$todo" ] && die "TODO: No task $item." [ -z "$todo" ] && die "TODO: No task $item."
@@ -945,7 +945,7 @@ case $action in
# Split multiple do's, if comma separated change to whitespace separated # Split multiple do's, if comma separated change to whitespace separated
# Loop the 'do' function for each item # Loop the 'do' function for each item
for item in `echo $* | tr ',' ' '`; do for item in $(echo $* | tr ',' ' '); do
[ -z "$item" ] && die "$errmsg" [ -z "$item" ] && die "$errmsg"
[[ "$item" = +([0-9]) ]] || die "$errmsg" [[ "$item" = +([0-9]) ]] || die "$errmsg"
@@ -953,8 +953,8 @@ case $action in
[ -z "$todo" ] && die "TODO: No task $item." [ -z "$todo" ] && die "TODO: No task $item."
# Check if this item has already been done # Check if this item has already been done
if [ `echo $todo | grep -c "^x "` -eq 0 ] ; then if [ $(echo $todo | grep -c "^x ") -eq 0 ] ; then
now=`date '+%Y-%m-%d'` now=$(date '+%Y-%m-%d')
# remove priority once item is done # remove priority once item is done
sed -i.bak $item"s/^(.) //" "$TODO_FILE" sed -i.bak $item"s/^(.) //" "$TODO_FILE"
sed -i.bak $item"s|^|x $now |" "$TODO_FILE" sed -i.bak $item"s|^|x $now |" "$TODO_FILE"