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

Moving scripts from /usr/share/live to /usr/lib/live for consistency with all debian-live packages.

This commit is contained in:
Daniel Baumann 2012-07-19 02:59:55 +02:00
parent 5816e7afe0
commit 2d16c7e258
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -40,13 +40,16 @@ build:
install: install:
# Installing shared data # Installing shared data
mkdir -p $(DESTDIR)/usr/share/live/build mkdir -p $(DESTDIR)/usr/share/live/build
cp -r frontends/cgi data examples functions scripts includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build cp -r frontends/cgi data examples functions includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
cp -r share/* $(DESTDIR)/usr/share/live/build cp -r share/* $(DESTDIR)/usr/share/live/build
# Installing executables # Installing executables
mkdir -p $(DESTDIR)/usr/bin mkdir -p $(DESTDIR)/usr/bin
cp -a bin/* $(DESTDIR)/usr/bin cp -a bin/* $(DESTDIR)/usr/bin
mkdir -p $(DESTDIR)/usr/lib/live
cp -a scripts/* $(DESTDIR)/usr/lib/live
# Installing documentation # Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-build mkdir -p $(DESTDIR)/usr/share/doc/live-build
cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-build cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-build

11
bin/lb
View File

@ -11,7 +11,12 @@
set -e set -e
# Including common functions # Including common functions
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh if [ -e "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh ]
then
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
else
. /usr/lib/live/build.sh
fi
# Setting static variables # Setting static variables
DESCRIPTION="$(Echo 'utility to build Debian Live systems')" DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@ -56,9 +61,9 @@ case "${1}" in
if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ] if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
then then
SCRIPT="${LB_BASE}/scripts/build/${COMMAND}" SCRIPT="${LB_BASE}/scripts/build/${COMMAND}"
elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ] elif [ -x /usr/lib/live/build/${COMMAND} ]
then then
SCRIPT=/usr/share/live/build/scripts/build/"${COMMAND}" SCRIPT=/usr/lib/live/build/"${COMMAND}"
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
then then
SCRIPT="${COMMAND}" SCRIPT="${COMMAND}"