diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-19 02:59:55 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-19 02:59:55 +0200 |
| commit | 2d16c7e2585c52d2c5eb10c19a5f4c8a066192db (patch) | |
| tree | f403ca7739ce3e6b13da1756580687e99346cfc0 /bin | |
| parent | 5816e7afe0d8187b4ffd627689e1aa427a1c1fc8 (diff) | |
| download | vyos-live-build-2d16c7e2585c52d2c5eb10c19a5f4c8a066192db.tar.gz vyos-live-build-2d16c7e2585c52d2c5eb10c19a5f4c8a066192db.zip | |
Moving scripts from /usr/share/live to /usr/lib/live for consistency with all debian-live packages.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lb | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -11,7 +11,12 @@ set -e # 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 DESCRIPTION="$(Echo 'utility to build Debian Live systems')" @@ -56,9 +61,9 @@ case "${1}" in if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ] then SCRIPT="${LB_BASE}/scripts/build/${COMMAND}" - elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ] + elif [ -x /usr/lib/live/build/${COMMAND} ] then - SCRIPT=/usr/share/live/build/scripts/build/"${COMMAND}" + SCRIPT=/usr/lib/live/build/"${COMMAND}" elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] then SCRIPT="${COMMAND}" |