From 67c1a866459151ba98331dfc152bcf7a00d5e87b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 23 Dec 2017 20:51:31 +0000
Subject: Update build scripts.

---
 build_all.sh               | 23 +++++++++++++++++++++++
 build_one.sh               |  9 +++++++++
 tools/build_live.sh        | 26 --------------------------
 update_bootloader_files.sh |  1 +
 4 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100755 build_all.sh
 create mode 100755 build_one.sh
 delete mode 100755 tools/build_live.sh

diff --git a/build_all.sh b/build_all.sh
new file mode 100755
index 0000000..2842913
--- /dev/null
+++ b/build_all.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+declare -A desktops
+
+release=6
+
+archs="i586 x86_64"
+
+desktops[i586]="Xfce"
+
+desktops[x86_64]="GNOME Plasma Xfce"
+
+./update_media.sh
+./update_bootloader_files.sh
+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
+    # 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
+done
diff --git a/build_one.sh b/build_one.sh
new file mode 100755
index 0000000..bf0b47b
--- /dev/null
+++ b/build_one.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+./update_media.sh
+./update_bootloader_files.sh
+draklive='perl -I ../drakiso/lib ../drakiso/draklive'
+if [ $# -ge 0 ] ; then
+  sudo $draklive $*
+else
+  sudo $draklive --clean --all
+fi
diff --git a/tools/build_live.sh b/tools/build_live.sh
deleted file mode 100755
index dce0430..0000000
--- a/tools/build_live.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# Run this script from the draklive-config directory:
-#  ./tools/build_live.sh
-
-declare -A desktops
-
-release=6-rc
-
-archs="i586 x86_64"
-
-desktops[i586]="Xfce"
-
-desktops[x86_64]="GNOME Plasma Xfce"
-
-pushd files/mga_rpms
-./update_media.sh
-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
-    # 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
-done
diff --git a/update_bootloader_files.sh b/update_bootloader_files.sh
index 98ff5dc..554f872 100755
--- a/update_bootloader_files.sh
+++ b/update_bootloader_files.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 repository=$(grep repository config/settings.cfg | sed s/repository=//)
+echo "Fetching bootloader files from $repository"
 
 # Remove old files
 rm -rf bootloader
-- 
cgit v1.2.1