summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-03 15:39:08 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-03 15:39:08 +0000
commitafb13d1257d5c9aabcdc1ef194f1a05b4f7a00e3 (patch)
tree94f0db95e5701e29a6d9cbcefd1fb78c9ab597e8
parentd73c34d30d805ddd442a7eb076f03d6531988020 (diff)
downloaddraklive-config-afb13d1257d5c9aabcdc1ef194f1a05b4f7a00e3.tar
draklive-config-afb13d1257d5c9aabcdc1ef194f1a05b4f7a00e3.tar.gz
draklive-config-afb13d1257d5c9aabcdc1ef194f1a05b4f7a00e3.tar.bz2
draklive-config-afb13d1257d5c9aabcdc1ef194f1a05b4f7a00e3.tar.xz
draklive-config-afb13d1257d5c9aabcdc1ef194f1a05b4f7a00e3.zip
Update build scripts for rename of draklive to draklive2.
-rwxr-xr-xbuild_all.sh4
-rwxr-xr-xbuild_one.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/build_all.sh b/build_all.sh
index 078cd04..fd271d7 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -13,10 +13,10 @@ desktops[x86_64]="GNOME Plasma Xfce"
for arch in $archs; do
./update_bootloader_files.sh $arch
for desktop in ${desktops[$arch]}; do
- sudo -u draklive sudo /usr/sbin/draklive --clean --all --define arch=$arch --define desktop=$desktop
+ sudo -u draklive sudo /usr/bin/draklive2 --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
# 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
+ sudo -u draklive sudo /usr/bin/draklive2 --clean --define arch=$arch --define desktop=$desktop
done
done
diff --git a/build_one.sh b/build_one.sh
index be6bac9..f8ba515 100755
--- a/build_one.sh
+++ b/build_one.sh
@@ -7,7 +7,7 @@ for arg in $*; do
fi
done
./update_bootloader_files.sh $arch
-draklive='perl -I ../drakiso/lib ../drakiso/draklive'
+draklive='perl -I ../drakiso/lib ../drakiso/draklive2'
if [ $# -gt 0 ] ; then
$draklive $*
else