diff --git a/bash_variables b/bash_variables index 3baf0b5..97a0a54 100755 --- a/bash_variables +++ b/bash_variables @@ -1,2 +1,3 @@ ## Maven configuration export MAVEN_OPTS='-Xms256m -XX:MaxPermSize=512m -Xmx1024m' +export GOPATH='/home/tony/.go/' diff --git a/bin/nux-env b/bin/nux-env index 697cedc..1553eb4 100755 --- a/bin/nux-env +++ b/bin/nux-env @@ -1,36 +1,44 @@ -#!/usr/bin/env nux-runner +#!/usr/bin/env nuxr-nuxsh ## Portable *nix environment by tonydamage ## status:: ## Show status of nux-env installation -task.status() { - echo nux-env folder: $NUX_ENV_DIR - pushd $NUX_ENV_DIR > /dev/null - git status - popd > /dev/null -} + +@namespace task. { + function :status { + echo nux-env folder: $NUX_ENV_DIR + pushd $NUX_ENV_DIR > /dev/null + git status + popd > /dev/null + } ## update:: ## pulls latest nux-env from repository. -task.update() { - pushd $NUX_ENV_DIR > /dev/null - git stash - git pull -r - git stash pop - popd > /dev/null + function :update { + pushd $NUX_ENV_DIR > /dev/null + git stash + git pull -r + git stash pop + popd > /dev/null } ## install:: ## Install nux-env recommended binaries if not present -task.install() { - : + function :install { + : -} + } +## fixmes:: +## List all fixmes for nux-env + function :fixmes { + fgrep -n FIXME "$NUX_INC_DIR/..bin/"* + find "$NUX_INC_DIR" -iname "*.sh" | xargs fgrep -n FIXME + } ## help library:: ## Displays help for specified nuxs-env library. ## -task.help.library() { - local name="$1" - nux.help.comment $NUX_INC_DIR/$name.inc.sh + function :help.library name { + nux.help.comment $NUX_INC_DIR/$name.inc.sh + } } diff --git a/bin/tdm-media b/bin/tdm-media index 8ebd6dc..47797a7 100755 --- a/bin/tdm-media +++ b/bin/tdm-media @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env nux-runner type ffmpeg > /dev/null 2>&1 && FFMPEG_OR_LIBAV=ffmpeg type avconv > /dev/null 2>&1 && FFMPEG_OR_LIBAV=avconv @@ -19,20 +19,44 @@ function task.nikon-mp4 { } function task.downscale { - TARGET=$1 - shift - SIZE=2048 + local TARGET=$1; shift; + local SIZE=$1; shift + local i=0; + local count="$#"; + mkdir -p $TARGET; for image in "$@"; do + let "i=i+1" target_file=$TARGET/$(basename $image) - echo "Downsampling image $image to $target_file" + echo "Image: $i/$count Downsampling $image -> $target_file" convert $image \ -filter Lanczos -sampling-factor 1x1 \ -resize "${SIZE}x${SIZE}>" \ -quality 90 \ $target_file done - } -TASK=$1 -shift -task.$TASK "$@" + + +## to:: +## +## Convert image to +## +function task.to { + target=$1; + shift; + if ! nux.check.function "media.to.$target" ; then + echo Target type "$target" is not supported. + return -1 + fi + for file in "$@"; do + target_dir=$(dirname "$file"); + target_file=$(basename "$file" | sed -re 's/\.[a-z0-9_]+$//g' -e "s/\$/.$target/g" ); + target_full="$target_dir/$target_file"; + media.to.$target "$file" "$target_full" + echo $file $target_file + done +} + +function media.to.jpg { + convert "$1" -quality 90 -auto-orient "$2" +} diff --git a/inc/nux/dsl.inc.sh b/inc/nux/dsl.inc.sh index 1420ea6..2858592 100644 --- a/inc/nux/dsl.inc.sh +++ b/inc/nux/dsl.inc.sh @@ -82,6 +82,7 @@ nux.dsl.exec() { local language="$1"; local file="$2"; local cached="${3:-$file${NUDSL_CACHE_SUFFIX}}"; + #FIXME: Add no-cache if nux.dsl.plan "$language" "$file" "$cached"; then source "$cached"; fi diff --git a/inc/nuxr.nuxsh.sh b/inc/nuxr.nuxsh.sh index 8436199..6c7da37 100644 --- a/inc/nuxr.nuxsh.sh +++ b/inc/nuxr.nuxsh.sh @@ -11,7 +11,7 @@ nux.use nuxr/repl nux.log debug "Running task: $TASK"; task.$TASK "$@" # Runs task else - echo "$NUX_SCRIPTNAME: Unrecognized task ''$TASK' not available." + echo "$NUX_SCRIPTNAME: Unrecognized task '$TASK' not available." echo "Try '$NUX_SCRIPTNAME help' for more information." return -1 }