From d5c6e2ec4e55788f4f3b3ab81e26882e93626f8f Mon Sep 17 00:00:00 2001 From: rushtongarth Date: Wed, 28 Jun 2017 21:13:58 -0400 Subject: [PATCH 1/2] Modification to handle executing from alternate locations --- install.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index 5fdaf81..06a3b99 100755 --- a/install.sh +++ b/install.sh @@ -1,8 +1,9 @@ #!/bin/bash INSTALL_DIR=$HOME/bin ALIAS_FILE=$HOME/.bashrc -prog="[""$(basename $0)""] " - +THIS_SCRIPT=$(readlink -f $0) +CODE_DIR=$(dirname $THIS_SCRIPT) +prog="[""$(basename $THIS_SCRIPT)""] " Usage(){ echo "Usage: $(basename $0) [options]" @@ -53,22 +54,25 @@ while [[ $# -gt 0 ]] ; do esac done -[[ -d $INSTALL_DIR ]] || mkdir -p $INSTALL_DIR + + +#[[ -d $INSTALL_DIR ]] || mkdir -p $INSTALL_DIR echo $prog"$INSTALL_DIR exists." -[[ -s $INSTALL_DIR/todo.py ]] && Update +#[[ -s $INSTALL_DIR/todo.py ]] && Update -[[ -s $ALIAS_FILE ]] || echo "# Bash RC File" >> $ALIAS_FILE +#[[ -s $ALIAS_FILE ]] || echo "# Bash RC File" >> $ALIAS_FILE echo $prog"$ALIAS_FILE exists." ## Believe it or not, >> is faster than >. echo $prog"Copying todo.py to $INSTALL_DIR/todo.py" if [[ ! -f $INSTALL_DIR/todo.py ]] ; then - cp ./todo.py $INSTALL_DIR + cp ${CODE_DIR}/todo.py $INSTALL_DIR else - cp -u ./todo.py $INSTALL_DIR + cp -u ${CODE_DIR}/todo.py $INSTALL_DIR fi + ## Establish alias pre="\n\n#Alias for todo.py\n" if grep -q -e "todo.sh" -e "todo.py" "$ALIAS_FILE" ; then From edb06da594a892beba7add09e8b1ea25e6756f74 Mon Sep 17 00:00:00 2001 From: rushtongarth Date: Thu, 10 Aug 2017 12:56:17 -0400 Subject: [PATCH 2/2] minor change to usage message --- todo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/todo.py b/todo.py index 3cadad3..dc890c6 100755 --- a/todo.py +++ b/todo.py @@ -715,8 +715,8 @@ def prepend_todo(args): @usage('\thelp | h', '\t\tDisplay this message and exit.\n') def cmd_help(): - print(concat(["Use", CONFIG["TODO_PY"], "-h for option help\n"], " ")) - print(concat(["Usage:", CONFIG["TODO_PY"], "command [arg(s)]"], " ")) + print(concat(["Use", os.path.basename(CONFIG["TODO_PY"]), "-h for option help\n"], " ")) + print(concat(["Usage:", os.path.basename(CONFIG["TODO_PY"]), "command [arg(s)]"], " ")) d = {} for (key, val) in commands.items(): d[val[1]] = (key, val[1])