From e7bb96f730836adca48f3f1b27446a10f95ffb75 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Mon, 19 Jun 2017 15:31:11 +0200 Subject: [PATCH] Added small updates. Signed-off-by: Tony Tkacik --- bin/nux-env | 11 +++++++++++ inc/dsl/nux.fs.inc.sh | 0 inc/nux-base.inc.sh | 10 +++++++--- inc/nuxfs.inc.sh | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 inc/dsl/nux.fs.inc.sh diff --git a/bin/nux-env b/bin/nux-env index 541849d..e58715e 100755 --- a/bin/nux-env +++ b/bin/nux-env @@ -18,6 +18,17 @@ task.update() { popd > /dev/null } +## install Install nux-env recommended binaries if not present +## task.install() { : + +} + +## help.inc +## Displays help for specified nuxs-env library. +## +task.help.inc() { + local name="$1" + nux.help.comment $NUX_INC_DIR/$name.inc.sh } diff --git a/inc/dsl/nux.fs.inc.sh b/inc/dsl/nux.fs.inc.sh new file mode 100644 index 0000000..e69de29 diff --git a/inc/nux-base.inc.sh b/inc/nux-base.inc.sh index a5e3951..e1a9c4d 100644 --- a/inc/nux-base.inc.sh +++ b/inc/nux-base.inc.sh @@ -1,7 +1,4 @@ ## #nux-base - NUX Script Base library -## - - readonly NUX_INC_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) readonly NUX_ENV_DIR=$(dirname $NUX_INC_DIR) @@ -196,6 +193,13 @@ function nux.help.shelldoc { } +function nux.url.parse { + format=${2:-"protocol:\2\nuser:\4\nhost:\5\nport:\7 \npath:\8"} + echo "$1" | sed \ + -re "s/(([^:\/]*):\/\/)?(([^@\/:]*)@)?([^:\/]+)(:([0-9]+))?(\/(.*))?/$format/g" + +} + NUX_ENV_MACHINE=/usr/ NUX_ENV_MACHINE_LOCAL=/usr/local/ NUX_ENV_USER_LOCAL=$HOME/.local diff --git a/inc/nuxfs.inc.sh b/inc/nuxfs.inc.sh index beef50f..72b7394 100644 --- a/inc/nuxfs.inc.sh +++ b/inc/nuxfs.inc.sh @@ -40,7 +40,7 @@ function nuxfs.file.exists { function nuxfs.closest { cmd=$1; - cdir=$2; + cdir=${2:-$(pwd)}; nux.log trace "Searching in: " $cdir; until [ -e "$cdir/$1" -o "$cdir" == "/" ]; do cdir=$(dirname "$cdir");