diff --git a/rc b/rc index b6ec26d..d12a094 100755 --- a/rc +++ b/rc @@ -1,36 +1,36 @@ # source me to enable tools case $OSTYPE in darwin*) - TOOLSPATH=$( realpath $( dirname "$BASH_SOURCE" ) ) + QTOOLSPATH=$( realpath $( dirname "$BASH_SOURCE" ) ) ;; *) - TOOLSPATH=$( readlink -f $( dirname "$BASH_SOURCE" ) ) + QTOOLSPATH=$( readlink -f $( dirname "$BASH_SOURCE" ) ) ;; esac -PATH=$PATH:"$TOOLSPATH"/bin -[[ "$1" = "-f" ]] && PATH="$TOOLSPATH"/bin:$PATH +PATH=$PATH:"$QTOOLSPATH"/bin +[[ "$1" = "-f" ]] && PATH="$QTOOLSPATH"/bin:$PATH -. "$TOOLSPATH"/qcd_function +. "$QTOOLSPATH"/qcd_function path_remove_duplicates -[[ -f "$TOOLSPATH"/tsv/tsvkit.sh ]] && . "$TOOLSPATH"/tsv/tsvkit.sh &>/dev/null +[[ -f "$QTOOLSPATH"/tsv/tsvkit.sh ]] && . "$QTOOLSPATH"/tsv/tsvkit.sh &>/dev/null function _q-tools-reload { # reload self - [[ -z "$TOOLSPATH" ]] && return - source "$TOOLSPATH"/rc + [[ -z "$QTOOLSPATH" ]] && return + source "$QTOOLSPATH"/rc } function _q-tools-update { # update self - [[ -z "$TOOLSPATH" ]] && return - [[ -w "$TOOLSPATH" ]] || return - "$TOOLSPATH"/rc -u + [[ -z "$QTOOLSPATH" ]] && return + [[ -w "$QTOOLSPATH" ]] || return + "$QTOOLSPATH"/rc -u _q-tools-reload } function _self_update() { - touch "$TOOLSPATH"/.lastupdate - pushd "$TOOLSPATH" > /dev/null + touch "$QTOOLSPATH"/.lastupdate + pushd "$QTOOLSPATH" > /dev/null [[ "$1" = "-u" ]] && { hg pull -u https://bitbucket.org/MoonQ/tools } || { @@ -38,23 +38,23 @@ function _self_update() { } popd > /dev/null # ncsv update - [[ -d "$TOOLSPATH"/ncsv ]] && { - pushd "$TOOLSPATH"/ncsv > /dev/null + [[ -d "$QTOOLSPATH"/ncsv ]] && { + pushd "$QTOOLSPATH"/ncsv > /dev/null [[ "$1" = "-u" ]] && { hg pull -u } || { timeout 10 hg pull -u > /dev/null 2>&1 } - ln -sfT ../ncsv/ncsv/ncsv.py "$TOOLSPATH"/bin/ncsv + ln -sfT ../ncsv/ncsv/ncsv.py "$QTOOLSPATH"/bin/ncsv popd > /dev/null } || true } function _check_ncsv() { - [[ -d "$TOOLSPATH"/ncsv ]] || { - hg clone https://bitbucket.org/MoonQ/ncsv "$TOOLSPATH"/ncsv - ln -sfT ../ncsv/ncsv/ncsv.py "$TOOLSPATH"/bin/ncsv + [[ -d "$QTOOLSPATH"/ncsv ]] || { + hg clone https://bitbucket.org/MoonQ/ncsv "$QTOOLSPATH"/ncsv + ln -sfT ../ncsv/ncsv/ncsv.py "$QTOOLSPATH"/bin/ncsv } } @@ -69,16 +69,16 @@ unset -f _check_ncsv # Update self weekly, # if folder writable, if repository, if an interactive terminal, if not updated the last week TOOLS_TO_UPDATE=1 -[[ -w "$TOOLSPATH" ]] || TOOLS_TO_UPDATE=0 -[[ -w "$TOOLSPATH"/.hg ]] || TOOLS_TO_UPDATE=0 +[[ -w "$QTOOLSPATH" ]] || TOOLS_TO_UPDATE=0 +[[ -w "$QTOOLSPATH"/.hg ]] || TOOLS_TO_UPDATE=0 [[ -t 0 ]] || TOOLS_TO_UPDATE=0 [[ -t 1 ]] || TOOLS_TO_UPDATE=0 [[ -t 2 ]] || TOOLS_TO_UPDATE=0 -[[ -f "$TOOLSPATH"/.lastupdate ]] || touch -t 0101010101 "$TOOLSPATH"/.lastupdate 2> /dev/null -[[ -w "$TOOLSPATH"/.lastupdate ]] || TOOLS_TO_UPDATE=0 +[[ -f "$QTOOLSPATH"/.lastupdate ]] || touch -t 0101010101 "$QTOOLSPATH"/.lastupdate 2> /dev/null +[[ -w "$QTOOLSPATH"/.lastupdate ]] || TOOLS_TO_UPDATE=0 if [ $TOOLS_TO_UPDATE -eq 1 ]; then - TOOLS_LASTUPDATE=$( "$TOOLSPATH"/files/file-age "$TOOLSPATH"/.lastupdate d ) + TOOLS_LASTUPDATE=$( "$QTOOLSPATH"/files/file-age "$QTOOLSPATH"/.lastupdate d ) [[ "$TOOLS_LASTUPDATE" -gt 7 ]] && _self_update unset TOOLS_LASTUPDATE fi