From c9aeb7998edb5e220ad5f94169fe193a491a833f Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin.whitaker.me.uk>
Date: Mon, 17 Dec 2018 20:32:31 +0000
Subject: Update settings.

s/version/release/ and remove settings that can be extracted from
the repo product.id file.
---
 build_all.sh        | 4 ++--
 config/build.cfg    | 4 ++--
 config/settings.cfg | 8 ++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build_all.sh b/build_all.sh
index 4c66280..d95287d 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 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
 
@@ -13,7 +13,7 @@ esac
 
 ./update_bootloader_files.sh
 for arch in $archs; do
-  isoname=$distro-$version-$arch
+  isoname=$distro-$release-$arch
   $sudo drakclassic --clean --all --define arch=$arch
   $sudo mkdir -p $destdir/$isoname
   $sudo cp $workdir/$isoname/dist/* $destdir/$isoname/
diff --git a/config/build.cfg b/config/build.cfg
index 3e3805b..38c7170 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -1,13 +1,13 @@
 sub build_label {
     my ($build) = @_;
 
-    join('-', 'Mageia', $build->{settings}{version}, $build->{settings}{arch});
+    join('-', 'Mageia', $build->{settings}{release}, $build->{settings}{arch});
 }
 
 sub build_title {
     my ($build) = @_;
 
-    join(' ', 'Mageia', $build->{settings}{version});
+    join(' ', 'Mageia', $build->{settings}{release});
 }
 
 my $arch = $build->{settings}{arch};
diff --git a/config/settings.cfg b/config/settings.cfg
index b949242..edf8ba9 100644
--- a/config/settings.cfg
+++ b/config/settings.cfg
@@ -1,10 +1,6 @@
-vendor=Mageia
+vendor=Mageia.Org
 distro=Mageia
-product=Installer
-type=classic
 arch=x86_64
-branch=Devel
-version=7-beta1
-release=1
+release=7-beta1
 repository=/home/bcd/build_bcd/pieces/cauldron
 workdir=/home/bcd/build_bcd
-- 
cgit v1.2.1