From dbf0a7c20c803d7ad431c87f0ec31a41bfafcfc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Wed, 30 Jul 2014 10:12:49 +0200 Subject: [PATCH] Misc improvements * Better support of build out of checkout. * Update version check to ensure we have latest live-build for Kali. --- auto/config | 8 ++++---- build_all.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/auto/config b/auto/config index 78e4a7a..e3c05e7 100755 --- a/auto/config +++ b/auto/config @@ -44,12 +44,12 @@ eval set -- "$temp" # live-build doesn't work if --parent-debian-distribution is unknown of # debian-cd => we have to put a symlink so that it deals with kali like wheezy -if [ ! -e /usr/share/live/build/data/debian-cd/kali ]; then - if [ -w /usr/share/live/build/data/debian-cd ]; then - ln -sf wheezy /usr/share/live/build/data/debian-cd/kali +if [ ! -e ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/kali ]; then + if [ -w ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd ]; then + ln -sf wheezy ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/kali else echo "ERROR: Run this first:" - echo "ln -sf wheezy /usr/share/live/build/data/debian-cd/kali" + echo "ln -sf wheezy ${LIVE_BUILD:-/usr/share/live/build}/data/debian-cd/kali" exit 1 fi fi diff --git a/build_all.sh b/build_all.sh index f1e5d50..638f303 100755 --- a/build_all.sh +++ b/build_all.sh @@ -67,8 +67,8 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Or we ensure we have proper version installed ver_live_build=$(dpkg-query -f '${Version}' -W live-build) -if dpkg --compare-versions "$ver_live_build" lt 3.0~b6; then - echo "You need live-build (>= 3.0~b6), you have $ver_live_build" >&2 +if dpkg --compare-versions "$ver_live_build" lt 3.0.5-1kali7; then + echo "You need live-build (>= 3.0.5-1kali7), you have $ver_live_build" >&2 exit 1 fi