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: Added support for specifying path.

Browse source 
Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
This commit is contained in:
Tony Tkáčik 2016-11-28 16:13:21 +01:00
parent ff642e4222
commit fbf020f0d3
3 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bin/nuxfs
View file

@ -51,7 +51,7 @@ function task.check {
def.notexists() {
nuxfs.error "$1" "does not exists".
}
nuxfs.initcfg
nuxfs.initcfg "$@"
nuxfs.dsl.execute "$NUXFS_DEF" "$NUXFS_DEF_DIR" "$WORKDIR_ABSOLUTE"
}
@ -76,7 +76,7 @@ function task.apply {
popd > /dev/null;
}
nuxfs.initcfg
nuxfs.initcfg "$@"
nuxfs.dsl.execute "$NUXFS_DEF" "$NUXFS_DEF_DIR" "$WORKDIR_ABSOLUTE"
}
@ -152,14 +152,23 @@ function nuxfs.template.list {
function nuxfs.initcfg {
WORKDIR=$(pwd);
NUXFS_DEF=$(nuxfs.closest $SUFFIX);
WORKDIR=$1;
if [ -n "$WORKDIR" ]; then
WORKDIR=$WORKDIR
else
WORKDIR=$(pwd);
fi;
nux.log debug Target: $WORKDIR
NUXFS_DEF=$(nuxfs.closest $SUFFIX "$WORKDIR");
if [ "$NUXFS_DEF" = "" ]; then
nuxfs.error $(pwd) "No nuxfs configuration found."
return;
fi;
NUXFS_DEF_DIR=$(dirname $NUXFS_DEF);
WORKDIR_RELATIVE=$(realpath "$WORKDIR" --relative-to "$NUXFS_DEF_DIR")
WORKDIR_ABSOLUTE=$(realpath "$WORKDIR")
WORKDIR_RELATIVE=$(realpath -ms "$WORKDIR" --relative-to "$NUXFS_DEF_DIR")
WORKDIR_ABSOLUTE=$(realpath -ms "$WORKDIR")
}