Commit 0732c24e authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix missed ETERBUILDBIN issue

parent 73621779
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# load_mod spec # load_mod spec
ETERBUILDETC=/etc/eterbuild ETERBUILDETC=/etc/eterbuild
ETERBUILDBIN=/usr/bin
ETERBUILDDIR=/usr/share/eterbuild ETERBUILDDIR=/usr/share/eterbuild
. /usr/share/eterbuild/functions/common . /usr/share/eterbuild/functions/common
......
...@@ -83,12 +83,12 @@ info() ...@@ -83,12 +83,12 @@ info()
mark_file_to_remove() mark_file_to_remove()
{ {
ETERSOFT_FATAL_REMOVE_FILES=$(estrlist union "$ETERSOFT_FATAL_REMOVE_FILES $@") ETERSOFT_FATAL_REMOVE_FILES=$(estrlist union "$ETERSOFT_FATAL_REMOVE_FILES $@") || fatal
} }
remove_file_from_remove() remove_file_from_remove()
{ {
ETERSOFT_FATAL_REMOVE_FILES=$(estrlist exclude "$*" "$ETERSOFT_FATAL_REMOVE_FILES") ETERSOFT_FATAL_REMOVE_FILES=$(estrlist exclude "$*" "$ETERSOFT_FATAL_REMOVE_FILES") || fatal
} }
# copied from eepm (and modified) # copied from eepm (and modified)
...@@ -136,7 +136,7 @@ set_eterbuilddir() ...@@ -136,7 +136,7 @@ set_eterbuilddir()
fi fi
fi fi
ETERBUILDBIN=$(realpath $ETERBUILDDIR/../../bin) ETERBUILDBIN=$(realpath $ETERBUILDDIR/../../bin)
test -n "$ETERBUILDDIR" && PATH=$ETERBUILDDIR/functions/commands:$PATH [ -d "$ETERBUILDDIR" ] && [ -d "$ETERBUILDBIN" ] && PATH=$ETERBUILDDIR/functions/commands:$PATH
# returns test result # returns test result
} }
......
...@@ -43,7 +43,8 @@ regexp_exclude_list() ...@@ -43,7 +43,8 @@ regexp_exclude_list()
estrlist() estrlist()
{ {
assert_var ETERBUILDBIN # can't use fatal here due $(estrlist) using
[ -x "$ETERBUILDBIN/estrlist" ] || return
$ETERBUILDBIN/estrlist "$@" $ETERBUILDBIN/estrlist "$@"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment