From 00cc8e6872850df1c61b00bb6d484bf56740f3ee Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 18 Nov 2018 00:38:57 +0100
Subject: Improved build scripts.

---
 build_all.sh | 15 +++++++++++----
 build_one.sh |  9 +++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/build_all.sh b/build_all.sh
index c881ffd..0b30f91 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -2,7 +2,10 @@
 
 declare -A desktops
 
+distro=$(grep distro config/settings.cfg | sed s/distro=//)
 version=$(grep version config/settings.cfg | sed s/version=//)
+workdir=$(grep workdir config/settings.cfg | sed s/workdir=//)
+destdir=/home/bcd/public_html/isos/trial-builds
 
 archs="i586 x86_64"
 
@@ -10,13 +13,17 @@ desktops[i586]="Xfce"
 
 desktops[x86_64]="GNOME Plasma Xfce"
 
+case $(hostname) in
+  *.mageia.org)  sudo_root="sudo -u draklive sudo"; sudo_bcd="sudo -u bcd";;
+esac
+
 ./update_bootloader_files.sh
 for arch in $archs; do
   for desktop in ${desktops[$arch]}; do
-    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-${version}-Live-${desktop}-${arch}
-    sudo -u bcd cp /home/draklive/var-data/build/Mageia-${version}-Live-${desktop}-${arch}/dist/* /home/bcd/public_html/isos/trial-builds/Mageia-${version}-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/
     # not enough space on rabbit's RAM disk for all four variants, so delete as we go
-    sudo -u draklive sudo /usr/bin/draklive2 --clean --define arch=$arch --define desktop=$desktop
+    $sudo_root draklive2 --clean --define arch=$arch --define desktop=$desktop
   done
 done
diff --git a/build_one.sh b/build_one.sh
index 161030e..dff302d 100755
--- a/build_one.sh
+++ b/build_one.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
+
+case $(hostname) in
+  *.mageia.org)  sudo="sudo -u draklive sudo";;
+esac
+
 ./update_bootloader_files.sh
 if [ $# -gt 0 ] ; then
-  draklive2 $*
+  $sudo draklive2 $*
 else
-  draklive2 --clean --all
+  $sudo draklive2 --clean --all
 fi
-- 
cgit v1.2.1