From 914f821f0375fd3112dc66a043d5dfea3c6a2830 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 4 Aug 2018 19:59:18 +0200 Subject: build_live.sh: get version from settings.cfg --- tools/build_live.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/build_live.sh b/tools/build_live.sh index 17f3292..89eb52f 100755 --- a/tools/build_live.sh +++ b/tools/build_live.sh @@ -4,7 +4,7 @@ declare -A desktops -release=6.1 +version=$(grep version config/settings.cfg | sed s/version=//) archs="i586 x86_64" @@ -18,8 +18,8 @@ popd for arch in $archs; do for desktop in ${desktops[$arch]}; do sudo -u draklive sudo /usr/sbin/draklive --clean --all --define arch=$arch --define desktop=$desktop - sudo -u bcd mkdir -p /home/bcd/public_html/isos/trial-builds/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD - sudo -u bcd cp /home/draklive/var-data/build/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD/dist/* /home/bcd/public_html/isos/trial-builds/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD + sudo -u bcd mkdir -p /home/bcd/public_html/isos/trial-builds/Mageia-${version}-LiveDVD-${desktop}-${arch}-DVD + sudo -u bcd cp /home/draklive/var-data/build/Mageia-${version}-LiveDVD-${desktop}-${arch}-DVD/dist/* /home/bcd/public_html/isos/trial-builds/Mageia-${version}-LiveDVD-${desktop}-${arch}-DVD # not enough space on rabbit's RAM disk for all four variants, so delete as we go sudo -u draklive sudo /usr/sbin/draklive --clean --define arch=$arch --define desktop=$desktop done -- cgit v1.2.1