X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kvariant.sh;h=d8fde68abba2b212ce7d6435ca8c8dead0a46f1d;hb=4bd97266e53cc34f98a57a18756152d1610a7961;hp=f369d2889bd3fe411f286c305d3e2e0eb8040baa;hpb=ce071abbbc30e0f5356d41e8cca8aaf8cc09d66f;p=bootcd.git diff --git a/kvariant.sh b/kvariant.sh index f369d28..d8fde68 100755 --- a/kvariant.sh +++ b/kvariant.sh @@ -51,14 +51,15 @@ variant=$1; shift kernelrpm_url=$1; shift [[ -n "$@" ]] && usage -standard_path="/usr/share/bootcd/build" +basedir=$(cd -P $(dirname $0); pwd) +standard_path="$basedir/build" if [ ! -d $standard_path ] ; then echo "Cound not find standard image $standard_path - exiting" exit 1 fi -variant_path=/usr/share/bootcd/$variant -if [ -e $variant_path ] ; then +variant_path="$basedir/$variant" +if [ -e "$variant_path" ] ; then echo "Found $variant_path - please remove first - exiting" exit 1 fi @@ -114,7 +115,7 @@ mv ${tmpdir}/bootcd.img ${isofsdir}/bootcd.img echo -n " bootcd.img" echo "" -rm -rf $tmpdir +rm -rf $tmpdir $kernelrpm echo "new variant $variant ready" trap - ERR