diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-01-04 11:24:25 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-01-04 11:24:25 +0100 |
| commit | a1c40cb0492ff25d88644a16292f95354fffc94a (patch) | |
| tree | e2a93efbf588ae66efcd451395eb6fa680162797 | |
| parent | 7c03834a71e20a25ebf8700ea32d0c2ae7988d02 (diff) | |
| download | draklive-config-a1c40cb0492ff25d88644a16292f95354fffc94a.tar draklive-config-a1c40cb0492ff25d88644a16292f95354fffc94a.tar.gz draklive-config-a1c40cb0492ff25d88644a16292f95354fffc94a.tar.bz2 draklive-config-a1c40cb0492ff25d88644a16292f95354fffc94a.tar.xz draklive-config-a1c40cb0492ff25d88644a16292f95354fffc94a.zip | |
Improve build script (and s/version/release/).
| -rwxr-xr-x | build_all.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build_all.sh b/build_all.sh index 0b30f91..860dea6 100755 --- a/build_all.sh +++ b/build_all.sh @@ -3,7 +3,7 @@ declare -A desktops distro=$(grep distro config/settings.cfg | sed s/distro=//) -version=$(grep version config/settings.cfg | sed s/version=//) +release=$(grep release config/settings.cfg | sed s/release=//) workdir=$(grep workdir config/settings.cfg | sed s/workdir=//) destdir=/home/bcd/public_html/isos/trial-builds @@ -20,9 +20,10 @@ esac ./update_bootloader_files.sh for arch in $archs; do for desktop in ${desktops[$arch]}; do + isoname=$distro-$release-Live-$desktop-$arch $sudo_root draklive2 --clean --all --define arch=$arch --define desktop=$desktop - $sudo_bcd mkdir -p $destdir/$distro-$version-Live-$desktop-$arch - $sudo_bcd cp $workdir/$distro-$version-Live-$desktop-$arch/dist/* $destdir/$distro-$version-Live-$desktop-$arch/ + $sudo_bcd mkdir -p $destdir/$isoname + $sudo_bcd cp $workdir/$isoname/dist/* $destdir/$isoname/ # not enough space on rabbit's RAM disk for all four variants, so delete as we go $sudo_root draklive2 --clean --define arch=$arch --define desktop=$desktop done |