From 4f7847f05e437254653dbb89ee1e77edccef26f4 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 23 Dec 2017 20:38:12 +0000
Subject: Move update_media.sh to top level and get repo path from settings.cfg

---
 files/mga_rpms/update_media.sh | 87 ----------------------------------------
 update_media.sh                | 90 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 87 deletions(-)
 delete mode 100755 files/mga_rpms/update_media.sh
 create mode 100755 update_media.sh

diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
deleted file mode 100755
index f742b66..0000000
--- a/files/mga_rpms/update_media.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-
-bcdmedia=/home/bcd/build_bcd/pieces/6
-
-copy_latest()
-{
-  repo=$1
-  for arch in i586 x86_64 ; do
-    if [ $2 = "lib" ] ; then
-      if [ $arch = "x86_64" ] ; then
-        name=lib64$3
-      else
-        name=lib$3
-      fi
-    else
-      name=$2
-    fi
-    if [ $arch = "i586" ] ; then
-      name=${name/-desktop-/-desktop586-}
-    fi
-    path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1`
-    if [ -z $path ] ; then
-      echo "Couldn't find $name for $arch"
-      exit 1
-    else
-      cp $path $arch/mga_rpms/$repo/
-    fi
-  done
-}
-
-# create dirs if non-existant
-mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info
-
-# clean dirs
-rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm
-rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/*
-
-# add grub2
-copy_latest core grub2-2*
-copy_latest core grub2-efi-2*
-copy_latest core grub2-mageia-theme-2*
-copy_latest core lib efivar0-*
-copy_latest core efibootmgr-*
-copy_latest core efivar-*
-
-# add dkms
-copy_latest core dkms-2*
-copy_latest core binutils-2*
-copy_latest core gcc-5*
-copy_latest core gcc-cpp-5*
-copy_latest core glibc-devel-*
-copy_latest core isl-0*
-copy_latest core kernel-desktop-devel-4*
-copy_latest core kernel-desktop-devel-latest-4*
-copy_latest core kernel-userspace-headers-4*
-copy_latest core lib isl15-0*
-copy_latest core lib mpc3-1*
-copy_latest core lib ncurses-devel-*
-copy_latest core libstdc++-devel-*
-copy_latest core make-4*
-
-# add nvidia
-copy_latest nonfree dkms-nvidia304-*
-copy_latest nonfree dkms-nvidia340-*
-copy_latest nonfree dkms-nvidia-current-*
-copy_latest nonfree x11-driver-video-nvidia304-*
-copy_latest nonfree x11-driver-video-nvidia340-*
-copy_latest nonfree x11-driver-video-nvidia-current-*
-
-# add broadcom-wl
-copy_latest nonfree dkms-broadcom-wl-*
-copy_latest nonfree broadcom-wl-common-*
-
-# add broadcom wireless configs
-copy_latest core broadcom-bcma-config-*
-copy_latest core broadcom-ssb-config-*
-
-# add repo pubkeys
-for arch in i586 x86_64 ; do
-  cp $bcdmedia/$arch/media/core/release/media_info/pubkey $arch/mga_rpms/core/media_info/
-  cp $bcdmedia/$arch/media/nonfree/release/media_info/pubkey $arch/mga_rpms/nonfree/media_info/
-done
-
-# create hdlists
-for arch in i586 x86_64 ; do
-  genhdlist2 $arch/mga_rpms/core
-  genhdlist2 $arch/mga_rpms/nonfree
-done
diff --git a/update_media.sh b/update_media.sh
new file mode 100755
index 0000000..f340fde
--- /dev/null
+++ b/update_media.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+repository=$(grep repository config/settings.cfg | sed s/repository=//)
+echo "Updating files/mga_rpms from $repository"
+
+cd files/mga_rpms
+
+copy_latest()
+{
+  repo=$1
+  for arch in i586 x86_64 ; do
+    if [ $2 = "lib" ] ; then
+      if [ $arch = "x86_64" ] ; then
+        name=lib64$3
+      else
+        name=lib$3
+      fi
+    else
+      name=$2
+    fi
+    if [ $arch = "i586" ] ; then
+      name=${name/-desktop-/-desktop586-}
+    fi
+    path=`ls -1v $repository/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1`
+    if [ -z $path ] ; then
+      echo "Couldn't find $name for $arch"
+      exit 1
+    else
+      cp $path $arch/mga_rpms/$repo/
+    fi
+  done
+}
+
+# create dirs if non-existant
+mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info
+
+# clean dirs
+rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm
+rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/*
+
+# add grub2
+copy_latest core grub2-2*
+copy_latest core grub2-efi-2*
+copy_latest core grub2-mageia-theme-2*
+copy_latest core lib efivar0-*
+copy_latest core efibootmgr-*
+copy_latest core efivar-*
+
+# add dkms
+copy_latest core dkms-2*
+copy_latest core binutils-2*
+copy_latest core gcc-5*
+copy_latest core gcc-cpp-5*
+copy_latest core glibc-devel-*
+copy_latest core isl-0*
+copy_latest core kernel-desktop-devel-4*
+copy_latest core kernel-desktop-devel-latest-4*
+copy_latest core kernel-userspace-headers-4*
+copy_latest core lib isl15-0*
+copy_latest core lib mpc3-1*
+copy_latest core lib ncurses-devel-*
+copy_latest core libstdc++-devel-*
+copy_latest core make-4*
+
+# add nvidia
+copy_latest nonfree dkms-nvidia304-*
+copy_latest nonfree dkms-nvidia340-*
+copy_latest nonfree dkms-nvidia-current-*
+copy_latest nonfree x11-driver-video-nvidia304-*
+copy_latest nonfree x11-driver-video-nvidia340-*
+copy_latest nonfree x11-driver-video-nvidia-current-*
+
+# add broadcom-wl
+copy_latest nonfree dkms-broadcom-wl-*
+copy_latest nonfree broadcom-wl-common-*
+
+# add broadcom wireless configs
+copy_latest core broadcom-bcma-config-*
+copy_latest core broadcom-ssb-config-*
+
+# add repo pubkeys
+for arch in i586 x86_64 ; do
+  cp $repository/$arch/media/core/release/media_info/pubkey $arch/mga_rpms/core/media_info/
+  cp $repository/$arch/media/nonfree/release/media_info/pubkey $arch/mga_rpms/nonfree/media_info/
+done
+
+# create hdlists
+for arch in i586 x86_64 ; do
+  genhdlist2 $arch/mga_rpms/core
+  genhdlist2 $arch/mga_rpms/nonfree
+done
-- 
cgit v1.2.1