tonydamage/nux-env
1
1
Fork 0
mirror of https://github.com/tonydamage/nux-env.git synced 2025-12-11 13:24:28 +01:00
Code Issues 19 Releases Wiki Activity

nuxfs: Updated nuxfs to behave better in REPL mode.

Browse source 
Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
This commit is contained in:
Tony Tkáčik 2017-06-29 14:12:25 +02:00
parent cfad8b1576
commit 1f07be6e0d
2 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
bin/nuxfs
View file

@ -30,10 +30,10 @@ nux.use nux.dsl
nux.use nuxfs nux.use nuxfs
local WORKDIR=$(pwd) WORKDIR=$(pwd)
local TEMPLATE_DIR=$NUX_ENV_DIR/templates TEMPLATE_DIR=$NUX_ENV_DIR/templates
local SUFFIX=".nuxfs" SUFFIX=".nuxfs"
local TEMPLATE_FILTER="*$SUFFIX" TEMPLATE_FILTER="*$SUFFIX"
@ -95,6 +95,9 @@ task.help.dsl() {
nux.help.comment "$NUX_INC_DIR/dsl/nuxfs.dsl" nux.help.comment "$NUX_INC_DIR/dsl/nuxfs.dsl"
} }
nuxfs.dsl.process() { nuxfs.dsl.process() {
WORKDIR=$(pwd); WORKDIR=$(pwd);
TARGET=$1; TARGET=$1;
@ -111,7 +114,7 @@ nuxfs.dsl.process() {
# #
if [ "$NUXFS_DEF" = "" ]; then if [ "$NUXFS_DEF" = "" ]; then
nuxfs.error $(pwd) "No nuxfs configuration found." nuxfs.error $(pwd) "No nuxfs configuration found."
exit 1; return 1;
fi fi
NUXFS_DEF_DIR=$(dirname $NUXFS_DEF); NUXFS_DEF_DIR=$(dirname $NUXFS_DEF);
TARGET_RELATIVE=$(realpath -ms "$TARGET" --relative-to "$NUXFS_DEF_DIR") TARGET_RELATIVE=$(realpath -ms "$TARGET" --relative-to "$NUXFS_DEF_DIR")
@ -136,7 +139,7 @@ nuxfs.dsl.process() {
# # nuxfs.warning "$3" "Does not have definition in $DEF"; # # nuxfs.warning "$3" "Does not have definition in $DEF";
# fi # fi
else else
nuxfs.error "$NUXFS_DEF" Definition file does not exists. nux.dsl.error "$NUXFS_DEF" Definition file does not exists.
fi fi
} }
@ -254,6 +257,13 @@ function task.capture {
} }
nuxr.repl.expose cd pwd ls find
nuxr.repl.prompt() {
echo "${nc_green}$NUX_APPNAME${nc_end}:${nc_blue}$(pwd)${nc_end}> "
}
function nuxfs.template.list { function nuxfs.template.list {
nux.log trace "Templates folders are: $(nux.cfg.get.path templates)" nux.log trace "Templates folders are: $(nux.cfg.get.path templates)"
for _dir in $(nux.cfg.get.path templates) ; do for _dir in $(nux.cfg.get.path templates) ; do

15
inc/dsl/nuxfs.dsl
View file

@ -45,6 +45,21 @@ dir.entered() {
fi fi
} }
.block opt-dir name
use-template() {
local template=$1;
local possible=$(nux.cfg.get.path "templates/$template.nuxfs");
if [ -z "$possible" ] ; then
rel_path=$template .error Template not found.
return
fi
to_include=$(echo "$possible" | head -n1)
nux.log trace "Possible templates: '$possible'"
nux.log trace "Template $to_include will be used"
source "$to_include"
}
## link <name> <target> ## link <name> <target>
## Defines a symbolik link with specified *name*, which points to ## Defines a symbolik link with specified *name*, which points to
## specified target ## specified target