From be4d4177321ac1920d79eb163e30367d602a4224 Mon Sep 17 00:00:00 2001 From: Buddy Sandidge Date: Wed, 17 Apr 2019 00:24:07 -0700 Subject: [PATCH] cleanup old bin scripts --- bin/duck-encoder | 4 +- bin/experiment-html | 49 ---- bin/fasterfirefox | 18 +- bin/filesize | 5 +- bin/getbook | 64 ---- bin/mv-to-docs | 64 ++-- bin/nave | 693 -------------------------------------------- bin/run-hpodder | 26 -- 8 files changed, 44 insertions(+), 879 deletions(-) delete mode 100755 bin/experiment-html delete mode 100755 bin/getbook delete mode 100755 bin/nave delete mode 100755 bin/run-hpodder diff --git a/bin/duck-encoder b/bin/duck-encoder index d00156a..c77f990 100755 --- a/bin/duck-encoder +++ b/bin/duck-encoder @@ -1,5 +1,3 @@ #!/usr/bin/env bash -dir=`dirname $0` -java -jar $dir/duck-encoder.jar $* - +java -jar $(dirname $0)/duck-encoder.jar $* diff --git a/bin/experiment-html b/bin/experiment-html deleted file mode 100755 index e53cd39..0000000 --- a/bin/experiment-html +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -experiment=$1 -dir=~/experiments/$experiment - -if [[ ! -d $dir ]]; then - mkdir $dir - git clone https://github.com/h5bp/html5-boilerplate.git $dir - cd $dir - rm -rf .git - git init - git add . - git commit -m "inital commit" - cd - -fi - -tmux has-session -t $experiment -if [[ $? == 0 ]]; then - tmux attach -t $experiment - exit -fi - -tmux new-session -s $experiment -n editor -d -tmux split-window -h -t $experiment - -tmux new-window -n console -t $experiment - -tmux split-window -h -t $experiment:2 -tmux split-window -v -t $experiment:2 - -tmux send-keys -t $experiment:1.1 "cd $dir" C-m -tmux send-keys -t $experiment:1.1 "vim index.html" C-m - -tmux send-keys -t $experiment:1.2 "cd $dir" C-m -tmux send-keys -t $experiment:1.2 "git status" C-m - -tmux send-keys -t $experiment:2.1 "cd $dir" C-m -tmux send-keys -t $experiment:2.1 "python -m SimpleHTTPServer" C-m - -tmux send-keys -t $experiment:2.2 "cd $dir" C-m -tmux send-keys -t $experiment:2.2 "livereload" C-m - -tmux send-keys -t $experiment:2.3 "cd $dir" C-m -tmux send-keys -t $experiment:2.3 "sleep 2" C-m -tmux send-keys -t $experiment:2.3 "chromium-browser http://localhost:8000 &" C-m - -tmux select-window -t $experiment:1 -tmux attach -t $experiment - diff --git a/bin/fasterfirefox b/bin/fasterfirefox index 8162914..38f81ff 100755 --- a/bin/fasterfirefox +++ b/bin/fasterfirefox @@ -9,26 +9,24 @@ then fi curdir=$(pwd) +config_dir="$HOME/.mozilla/firefox" -for dir in $(cat ~/.mozilla/firefox/profiles.ini | grep Path= | sed -e 's/Path=//') +for dir in $(cat "$config_dir/profiles.ini" | grep Path= | sed -e s/Path=//) do - cd ~/.mozilla/firefox/$dir 2>/dev/null + cd $config_dir/$dir 2>/dev/null if [ $? == 0 ] then - echo "In $(pwd)" - echo -e " running...\n" - + echo "cleaning $dir" for F in $(find . -type f -name '*.sqlite' -print) do + echo -e "vacuum $F" sqlite3 $F "VACUUM;" done - - echo -e "done in $(pwd) ...\n" + echo -e "done in $dir" else - echo -e "\n !!!! Error while entering directory $dir !!!!\n" + echo -e "error entering directory $dir" fi done -echo "Job finished"; +echo "job cleaning"; cd $curdir - diff --git a/bin/filesize b/bin/filesize index 06352c8..9715d89 100755 --- a/bin/filesize +++ b/bin/filesize @@ -6,11 +6,10 @@ my @sortedFiles = `du -s * | sort -nr`; foreach my $file (@sortedFiles) { # Get just the file name, remove size my @fileName = split("\t", $file); - my $realFileName = @fileName[1]; + my $realFileName = $fileName[1]; chomp($realFileName); # Print the size of the file and the file size - my $fileSortedPrintCmd = "du -hs \"$realFileName\""; + my $fileSortedPrintCmd = "du -s \"$realFileName\""; print `$fileSortedPrintCmd`; } - diff --git a/bin/getbook b/bin/getbook deleted file mode 100755 index 0ee4a7c..0000000 --- a/bin/getbook +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python -"""Get books from project gutenberg by passing the book id""" - -import os -import sys -import urllib2 - -from BeautifulSoup import BeautifulSoup - -_PAGE_URL = "http://www.gutenberg.org/etext/%d" -_DL_LINK = "http://www.gutenberg.org/cache/epub/%d/pg%d.mobi" - -class Book: - """Book gets the author and title by scraping the page""" - - def __init__(self, book_id): - """Scraping the page author and title of the page""" - self._book = book_id - self._html = urllib2.urlopen(_PAGE_URL % self._book) - self._soup = BeautifulSoup(self._html) - self._title = self._soup.h1.contents[0] - - by_parts = self._title.split(' by ') - - self._author = ' by '.join(by_parts[-1:]) - self._title = ' by '.join(by_parts[:-1]) - - def get_author(self): - """Return the author""" - return self._author - - def get_title(self): - """Return the title""" - return self._title - -def get_book_ids(): - """Get the arguments from the command line - ignore bad arguments""" - id_args = sys.argv[1:] - ids = [] - for book_id in id_args: - try: - ids.append(int(book_id)) - except ValueError: - print "ERROR: Could not add id '%s', must be id" % book_id - return ids - -def main(): - """Run the script""" - ids = get_book_ids() - for bid in ids: - tmp_book = Book(bid) - if not os.path.exists(tmp_book.get_author()): - os.makedirs(tmp_book.get_author()) - - mobi_file = urllib2.urlopen(_DL_LINK % (bid, bid)) - output = open('%s/%s.mobi' % \ - (tmp_book.get_author(), tmp_book.get_title()), 'wb') - output.write(mobi_file.read()) - output.close() - -if __name__ == "__main__": - main() - - diff --git a/bin/mv-to-docs b/bin/mv-to-docs index 263d933..afeb666 100755 --- a/bin/mv-to-docs +++ b/bin/mv-to-docs @@ -1,7 +1,8 @@ -#!/usr/bin/env python -""" +#!/usr/bin/env python3 + +''' Move a document to the correct documents folder -""" +''' import filecmp import os @@ -14,63 +15,64 @@ from datetime import date _slugify_strip_re = re.compile(r'[^\w\s-]') _slugify_hyphenate_re = re.compile(r'[-\s]+') def slugify(value): - """ + ''' Normalizes string, converts to lowercase, removes non-alpha characters, and converts spaces to hyphens. From Django's "django/template/defaultfilters.py". - """ + ''' import unicodedata - if not isinstance(value, unicode): - value = unicode(value) value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore') value = unicode(_slugify_strip_re.sub('', value).strip().lower()) return _slugify_hyphenate_re.sub('-', value) def usage(): - return "Usage: mv-to-docs [SRC_DOC] [CATEGORY] [MSG]" - -if __name__ == "__main__": - try: - file_name = sys.argv[1] - dir_name = slugify(sys.argv[2]) - except IndexError: - sys.exit(usage()) - - try: - msg = slugify(sys.argv[3]) - except IndexError: - msg = "" + return 'Usage: mv-to-docs [SRC_DOC] [CATEGORY] [MESSAGE]' - file_type = file_name.split(".")[-1] +def main(file_name='', dir_name='', message = ''): + file_type = file_name.split('.')[-1] if not os.path.isfile(file_name): - print "ERROR: Cannot find file '%s'" % file_name + print('ERROR: Cannot find file: {}'.format(file_name)) sys.exit(usage()) file_date = date.fromtimestamp(os.path.getmtime(file_name)) - doc_path = os.path.expanduser("~/documents/records/%s" % dir_name) + doc_path = os.path.expanduser('~/documents/records/{}'.format(dir_name)) if not os.path.exists(doc_path): - print "Could not find path, creating directory '%s'" % doc_path + print('could not find path → creating directory: {}'.format(doc_path)) os.mkdir(doc_path) - path_with_year = "%s/%s" % (doc_path, file_date.strftime("%Y")) + path_with_year = "%s/%s".format((doc_path, file_date.strftime("%Y"))) if not os.path.exists(path_with_year): os.mkdir(path_with_year) pass - new_file_path = "%s/%s_%s.%s" % \ - (path_with_year, file_date.strftime("%Y-%m-%d"), msg, file_type) + new_file_path = '%s/%s_%s.%s'.format(path_with_year, + file_date.strftime("%Y-%m-%d"), + message, + file_type) if not os.path.isfile(new_file_path): - print "Moving file '%s' to '%s'" % (file_name, new_file_path) + print("Moving file '%s' to '%s'" % (file_name, new_file_path)) shutil.copyfile(file_name, new_file_path) os.unlink(file_name) else: if filecmp.cmp(new_file_path, file_name): - print "Two files already exist and are same: '%s' and '%s'" % \ - (file_name, new_file_path) + print('Two files already exist and are same: {} and {}'.format(file_name, new_file_path)) else: - print "Destination file '%s' already exists" % (new_file_path) + print('destination file already exists {}'.format(new_file_path)) + +if __name__ == "__main__": + try: + file_name = sys.argv[1] + dir_name = slugify(sys.argv[2]) + except IndexError: + sys.exit(usage()) + + try: + message = slugify(sys.argv[3]) + except IndexError: + message = "" + main(file_name=file_name, dir_name=dir_name, message=message) diff --git a/bin/nave b/bin/nave deleted file mode 100755 index 11854e4..0000000 --- a/bin/nave +++ /dev/null @@ -1,693 +0,0 @@ -#!/bin/bash - -# This program contains parts of narwhal's "sea" program, -# as well as bits borrowed from Tim Caswell's "nvm" - -# nave install -# Fetch the version of node and install it in nave's folder. - -# nave use -# Install the if it isn't already, and then start -# a subshell with that version's folder at the start of the -# $PATH - -# nave use program.js -# Like "nave use", but have the subshell start the program.js -# immediately. - -# When told to use a version: -# Ensure that the version exists, install it, and -# then add its prefix to the PATH, and start a subshell. - -if [ "$NAVE_DEBUG" != "" ]; then - set -x -fi - -if [ -z "$BASH" ]; then - cat >&2 <&2 - exit 1 - ;; -esac - -# Use fancy pants globs -shopt -s extglob - -# Try to figure out the os and arch for binary fetching -uname="$(uname -a)" -os= -arch= -case "$uname" in - Linux\ *) os=linux ;; - Darwin\ *) os=darwin ;; - SunOS\ *) os=sunos ;; -esac -case "$uname" in - *i386*) arch=x86 ;; - *x86_64*) arch=x64 ;; - *raspberrypi*) arch=arm-pi ;; -esac - -tar=${TAR-tar} - -main () { - local SELF_PATH DIR SYM - # get the absolute path of the executable - SELF_PATH="$0" - if [ "${SELF_PATH:0:1}" != "." ] && [ "${SELF_PATH:0:1}" != "/" ]; then - SELF_PATH=./"$SELF_PATH" - fi - SELF_PATH=$( cd -P -- "$(dirname -- "$SELF_PATH")" \ - && pwd -P \ - ) && SELF_PATH=$SELF_PATH/$(basename -- "$0") - - # resolve symlinks - while [ -h "$SELF_PATH" ]; do - DIR=$(dirname -- "$SELF_PATH") - SYM=$(readlink -- "$SELF_PATH") - SELF_PATH=$( cd -- "$DIR" \ - && cd -- $(dirname -- "$SYM") \ - && pwd \ - )/$(basename -- "$SYM") - done - - if ! [ -d "$NAVE_DIR" ]; then - if [ -d "$HOME" ]; then - NAVE_DIR="$HOME"/.nave - else - NAVE_DIR=/usr/local/lib/nave - fi - fi - if ! [ -d "$NAVE_DIR" ] && ! mkdir -p -- "$NAVE_DIR"; then - NAVE_DIR="$(dirname -- "$SELF_PATH")" - fi - - # set up the naverc init file. - # For zsh compatibility, we name this file ".zshenv" instead of - # the more reasonable "naverc" name. - # Important! Update this number any time the init content is changed. - local rcversion="#3" - local rcfile="$NAVE_DIR/.zshenv" - if ! [ -f "$rcfile" ] \ - || [ "$(head -n1 "$rcfile")" != "$rcversion" ]; then - - cat > "$rcfile" < "$NAVE_DIR/.zlogout" <&2 - exit $ret - fi -} - -function enquote_all () { - local ARG ARGS - ARGS="" - for ARG in "$@"; do - [ -n "$ARGS" ] && ARGS="$ARGS " - ARGS="$ARGS'""$( echo " $ARG" \ - | cut -c 2- \ - | sed 's/'"'"'/'"'"'"'"'"'"'"'"'/g' \ - )""'" - done - echo "$ARGS" -} - -ensure_dir () { - if ! [ -d "$1" ]; then - mkdir -p -- "$1" || fail "couldn't create $1" - fi -} - -remove_dir () { - if [ -d "$1" ]; then - rm -rf -- "$1" || fail "Could not remove $1" - fi -} - -fail () { - echo "$@" >&2 - exit 1 -} - -nave_fetch () { - local version=$(ver "$1") - if nave_has "$version"; then - echo "already fetched $version" >&2 - return 0 - fi - - local src="$NAVE_SRC/$version" - remove_dir "$src" - ensure_dir "$src" - - local url - local urls=( - "https://iojs.org/dist/v$version/iojs-v$version.tar.gz" - "http://nodejs.org/dist/v$version/node-v$version.tar.gz" - "http://nodejs.org/dist/node-v$version.tar.gz" - "http://nodejs.org/dist/node-$version.tar.gz" - ) - for url in "${urls[@]}"; do - get -#Lf "$url" > "$src".tgz - if [ $? -eq 0 ]; then - $tar xzf "$src".tgz -C "$src" --strip-components=1 - if [ $? -eq 0 ]; then - echo "fetched from $url" >&2 - return 0 - fi - fi - done - - rm "$src".tgz - remove_dir "$src" - echo "Couldn't fetch $version" >&2 - return 1 -} - -get () { - curl -H "user-agent:nave/$(curl --version | head -n1)" "$@" - return $? -} - -build () { - local version="$1" - - # shortcut - try the binary if possible. - if [ -n "$os" ]; then - local binavail - # binaries started with node 0.8.6 - case "$version" in - 0.8.[012345]) binavail=0 ;; - 0.[1234567]) binavail=0 ;; - *) binavail=1 ;; - esac - if [ $binavail -eq 1 ]; then - local t="$version-$os-$arch" - local tgz="$NAVE_SRC/$t.tgz" - for url in "https://iojs.org/dist/v$version/iojs-v${t}.tar.gz" \ - "http://nodejs.org/dist/v$version/node-v${t}.tar.gz"; do - get -#Lf "$url" > "$tgz" - if [ $? -ne 0 ]; then - # binary download failed. oh well. cleanup, and proceed. - rm "$tgz" - else - # unpack straight into the build target. - $tar xzf "$tgz" -C "$2" --strip-components 1 - if [ $? -ne 0 ]; then - rm "$tgz" - nave_uninstall "$version" - echo "Binary unpack failed, trying source." >&2 - fi - # it worked! - echo "installed from binary" >&2 - return 0 - fi - done - echo "Binary download failed, trying source." >&2 - fi - fi - - nave_fetch "$version" - if [ $? != 0 ]; then - # fetch failed, don't continue and try to build it. - return 1 - fi - - local src="$NAVE_SRC/$version" - local jobs=$NAVE_JOBS - jobs=${jobs:-$JOBS} - jobs=${jobs:-$(sysctl -n hw.ncpu)} - jobs=${jobs:-2} - - ( cd -- "$src" - [ -f ~/.naverc ] && . ~/.naverc || true - if [ "$NAVE_CONFIG" == "" ]; then - NAVE_CONFIG=() - fi - JOBS=$jobs ./configure "${NAVE_CONFIG[@]}" --prefix="$2" \ - || fail "Failed to configure $version" - JOBS=$jobs make -j$jobs \ - || fail "Failed to make $version" - make install || fail "Failed to install $version" - ) || fail "fail" - return $? -} - -nave_usemain () { - if [ ${NAVELVL-0} -gt 0 ]; then - fail "Can't usemain inside a nave subshell. Exit to main shell." - fi - local version=$(ver "$1") - local current=$(node -v || true) - local wn=$(which node || true) - local prefix="/usr/local" - if [ "x$wn" != "x" ]; then - prefix="${wn/\/bin\/node/}" - if [ "x$prefix" == "x" ]; then - prefix="/usr/local" - fi - fi - current="${current/v/}" - if [ "$current" == "$version" ]; then - echo "$version already installed" >&2 - return 0 - fi - - build "$version" "$prefix" -} - -nave_install () { - local version=$(ver "$1") - if [ -z "$version" ]; then - fail "Must supply a version ('stable', 'latest' or numeric)" - fi - if nave_installed "$version"; then - echo "Already installed: $version" >&2 - return 0 - fi - local install="$NAVE_ROOT/$version" - ensure_dir "$install" - - build "$version" "$install" - local ret=$? - if [ $ret -ne 0 ]; then - remove_dir "$install" - return $ret - fi -} - -nave_test () { - local version=$(ver "$1") - nave_fetch "$version" - local src="$NAVE_SRC/$version" - ( cd -- "$src" - [ -f ~/.naverc ] && . ~/.naverc || true - if [ "$NAVE_CONFIG" == "" ]; then - NAVE_CONFIG=() - fi - ./configure "${NAVE_CONFIG[@]}" || fail "failed to ./configure" - make test-all || fail "Failed tests" - ) || fail "failed" -} - -nave_ls () { - ls -- $NAVE_SRC | version_list "src" \ - && ls -- $NAVE_ROOT | version_list "installed" \ - && nave_ls_named \ - || return 1 -} - -nave_ls_remote () { - get -s http://nodejs.org/dist/ \ - | version_list "remote" \ - || return 1 -} - -nave_ls_named () { - echo "named:" - ls -- "$NAVE_ROOT" \ - | egrep -v '[0-9]+\.[0-9]+\.[0-9]+' \ - | sort \ - | while read name; do - echo "$name: $(ver $($NAVE_ROOT/$name/bin/node -v 2>/dev/null))" - done -} - -nave_ls_all () { - nave_ls \ - && (echo ""; nave_ls_remote) \ - || return 1 -} - -ver () { - local version="$1" - local nonames="$2" - version="${version/v/}" - case $version in - latest | stable) nave_$version ;; - +([0-9])\.+([0-9])) nave_version_family "$version" ;; - +([0-9])\.+([0-9])\.+([0-9])) echo $version ;; - *) [ "$nonames" = "" ] && echo $version ;; - esac -} - -nave_version_family () { - local family="$1" - family="${family/v/}" - { get -s http://nodejs.org/dist/; - get -s https://iojs.org/dist/; } \ - | egrep -o $family'\.[0-9]+' \ - | sort -u -k 1,1n -k 2,2n -k 3,3n -t . \ - | tail -n1 -} - -nave_latest () { - get -s https://iojs.org/dist/ \ - | egrep -o '[0-9]+\.[0-9]+\.[0-9]+' \ - | sort -u -k 1,1n -k 2,2n -k 3,3n -t . \ - | tail -n1 -} - -nave_stable () { - get -s http://nodejs.org/dist/ \ - | egrep -o '[0-9]+\.[0-9]*[02468]\.[0-9]+' \ - | sort -u -k 1,1n -k 2,2n -k 3,3n -t . \ - | tail -n1 -} - -version_list_named () { - egrep -v '[0-9]+\.[0-9]+\.[0-9]+' \ - | sort -u -k 1,1n -k 2,2n -k 3,3n -t . \ - | organize_version_list \ - || return 1 -} - -version_list () { - echo "$1:" - egrep -o '[0-9]+\.[0-9]+\.[0-9]+' \ - | sort -u -k 1,1n -k 2,2n -k 3,3n -t . \ - | organize_version_list \ - || return 1 -} - -organize_version_list () { - local i=0 - local v - while read v; do - if [ $i -eq 8 ]; then - i=0 - echo "$v" - else - let 'i = i + 1' - echo -ne "$v\t" - fi - done - echo "" - [ $i -ne 0 ] && echo "" - return 0 -} - -nave_has () { - local version=$(ver "$1") - [ -x "$NAVE_SRC/$version/configure" ] || return 1 -} - -nave_installed () { - local version=$(ver "$1") - [ -x "$NAVE_ROOT/$version/bin/node" ] || return 1 -} - -nave_use () { - local version=$(ver "$1") - - # if it's not a version number, then treat as a name. - case "$version" in - +([0-9])\.+([0-9])\.+([0-9])) ;; - *) - nave_named "$@" - return $? - ;; - esac - - if [ -z "$version" ]; then - fail "Must supply a version" - fi - - if [ "$version" == "$NAVENAME" ]; then - echo "already using $version" >&2 - if [ $# -gt 1 ]; then - shift - "$@" - fi - return $? - fi - - nave_install "$version" || fail "failed to install $version" - local prefix="$NAVE_ROOT/$version" - local lvl=$[ ${NAVELVL-0} + 1 ] - echo "using $version" >&2 - if [ $# -gt 1 ]; then - shift - nave_exec "$lvl" "$version" "$version" "$prefix" "$@" - return $? - else - nave_login "$lvl" "$version" "$version" "$prefix" - return $? - fi -} - -# internal -nave_exec () { - nave_run "exec" "$@" - return $? -} - -nave_login () { - nave_run "login" "$@" - return $? -} - -nave_run () { - local exec="$1" - shift - local lvl="$1" - shift - local name="$1" - shift - local version="$1" - shift - local prefix="$1" - shift - - local bin="$prefix/bin" - local lib="$prefix/lib/node" - local man="$prefix/share/man" - ensure_dir "$bin" - ensure_dir "$lib" - ensure_dir "$man" - - # now $@ is the command to run, or empty if it's not an exec. - local exit_code - local args=() - local isLogin - - if [ "$exec" == "exec" ]; then - isLogin="" - # source the nave env file, then run the command. - args=("-c" ". $(enquote_all $NAVE_DIR/.zshenv); $(enquote_all "$@")") - elif [ "$shell" == "zsh" ]; then - isLogin="1" - # no need to set rcfile, since ZDOTDIR is set. - args=() - else - isLogin="1" - # bash, use --rcfile argument - args=("--rcfile" "$NAVE_DIR/.zshenv") - fi - - local nave="$version" - if [ "$version" != "$name" ]; then - nave="$name"-"$version" - fi - - NAVELVL=$lvl \ - NAVEPATH="$bin" \ - NAVEVERSION="$version" \ - NAVENAME="$name" \ - NAVE="$nave" \ - npm_config_binroot="$bin"\ - npm_config_root="$lib" \ - npm_config_manroot="$man" \ - npm_config_prefix="$prefix" \ - NODE_PATH="$lib" \ - NAVE_LOGIN="$isLogin" \ - NAVE_DIR="$NAVE_DIR" \ - ZDOTDIR="$NAVE_DIR" \ - "$SHELL" "${args[@]}" - - exit_code=$? - hash -r - return $exit_code -} - -nave_named () { - local name="$1" - shift - - local version=$(ver "$1" NONAMES) - if [ "$version" != "" ]; then - shift - fi - - add_named_env "$name" "$version" || fail "failed to create $name env" - - if [ "$name" == "$NAVENAME" ] && [ "$version" == "$NAVEVERSION" ]; then - echo "already using $name" >&2 - if [ $# -gt 0 ]; then - "$@" - fi - return $? - fi - - if [ "$version" = "" ]; then - version="$(ver "$("$NAVE_ROOT/$name/bin/node" -v 2>/dev/null)")" - fi - - local prefix="$NAVE_ROOT/$name" - - local lvl=$[ ${NAVELVL-0} + 1 ] - # get the version - if [ $# -gt 0 ]; then - nave_exec "$lvl" "$name" "$version" "$prefix" "$@" - return $? - else - nave_login "$lvl" "$name" "$version" "$prefix" - return $? - fi -} - -add_named_env () { - local name="$1" - local version="$2" - local cur="$(ver "$($NAVE_ROOT/$name/bin/node -v 2>/dev/null)" "NONAMES")" - - if [ "$version" != "" ]; then - version="$(ver "$version" "NONAMES")" - else - version="$cur" - fi - - if [ "$version" = "" ]; then - echo "What version of node?" - read -p "stable, latest, x.y, or x.y.z > " version - version=$(ver "$version") - fi - - # if that version is already there, then nothing to do. - if [ "$cur" = "$version" ]; then - return 0 - fi - - echo "Creating new env named '$name' using node $version" >&2 - - nave_install "$version" || fail "failed to install $version" - ensure_dir "$NAVE_ROOT/$name/bin" - ensure_dir "$NAVE_ROOT/$name/lib/node" - ensure_dir "$NAVE_ROOT/$name/lib/node_modules" - ensure_dir "$NAVE_ROOT/$name/share/man" - - ln -sf -- "$NAVE_ROOT/$version/bin/node" "$NAVE_ROOT/$name/bin/node" - ln -sf -- "$NAVE_ROOT/$version/bin/npm" "$NAVE_ROOT/$name/bin/npm" - ln -sf -- "$NAVE_ROOT/$version/bin/node-waf" "$NAVE_ROOT/$name/bin/node-waf" -} - -nave_clean () { - rm -rf "$NAVE_SRC/$(ver "$1")" "$NAVE_SRC/$(ver "$1")".tgz "$NAVE_SRC/$(ver "$1")"-*.tgz -} - -nave_uninstall () { - remove_dir "$NAVE_ROOT/$(ver "$1")" -} - -nave_help () { - cat < - -Commands: - -install Install the version passed (ex: 0.1.103) -use Enter a subshell where is being used -use Enter a subshell, and run "", then exit -use Create a named env, using the specified version. - If the name already exists, but the version differs, - then it will update the link. -usemain Install in /usr/local/bin (ie, use as your main nodejs) -clean Delete the source code for -uninstall Delete the install for -ls List versions currently installed -ls-remote List remote node versions -ls-all List remote and local node versions -latest Show the most recent dist version -help Output help information - - can be the string "latest" to get the latest distribution. - can be the string "stable" to get the latest stable version. - -EOF -} - -main "$@" diff --git a/bin/run-hpodder b/bin/run-hpodder deleted file mode 100755 index d873a26..0000000 --- a/bin/run-hpodder +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -logdir="/tmp/hpodder/" -logfile="$logdir`whoami`.`date +%F`.log" -lockfile="$logdir/lock.log" -dir=`dirname $0` - -if [[ ! -d $logdir ]]; then - echo "Log directory doesn't exist, create it '$logdir'" - mkdir -p $logdir - chmod 777 $logdir -fi - -if [[ -f $lockfile ]]; then - echo "Exit, stale lock file found $lockfile" - exit 1 -fi - -touch $lockfile -hpodder fetch >> $logfile -cd ~/podcasts -for dir in $(find . -maxdepth 1 -mindepth 1 -type d); do - prefix-date $dir -done -cd - -rm $lockfile