manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calling local live-build embedded in config directly rather than to adjust path.

This commit is contained in:
Daniel Baumann 2012-08-27 14:55:15 +02:00
parent 365e4c81c5
commit d0561821e4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/lb
View File

@ -57,6 +57,10 @@ case "${1}" in
then then
# User has live-build copied locally in the system # User has live-build copied locally in the system
SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}" SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
then
# User has live-build embedded in the config
SCRIPT="local/live-build/scripts/build/${COMMAND}"
elif [ -x /usr/lib/live/build/${COMMAND} ] elif [ -x /usr/lib/live/build/${COMMAND} ]
then then
# User has live-build installed in the system # User has live-build installed in the system

3
functions/defaults.sh
View File

@ -15,8 +15,7 @@ Set_defaults ()
if [ -e local/live-build ] if [ -e local/live-build ]
then then
LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}" LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
PATH="${PWD}/local/live-build/scripts/build:${PATH}" export LIVE_BUILD
export LIVE_BUILD PATH
fi fi
# Setting system type # Setting system type

3
scripts/build.sh
View File

@ -3,8 +3,7 @@
if [ -e local/live-build ] if [ -e local/live-build ]
then then
LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}" LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
PATH="${PWD}/local/live-build/scripts/build:${PATH}" export LIVE_BUILD
export LIVE_BUILD PATH
fi fi
# Source global functions # Source global functions