Modifications

- grub: bump
- release: bump
- pacman-mirrors: use conf from pacman-mirrorlist pkg

Author: hphilm

grub/PKGBUILD

@@ -7,7 +7,7 @@
 # Maintainer: Guinux <nuxgui|gmail|com>
 
 _pkgver="2.02"
-_GRUB_GIT_TAG="2.02-rc1"
+_GRUB_GIT_TAG="2.02-rc2"
 _SNAPSHOT="ec4aca088a04fce6c7d97c733ec272c63b0a1231"
 _SNAPSHOT_EXTRAS="f2a079441939eee7251bf141986cdd78946e1d20"
 
@@ -18,7 +18,7 @@ _UNIFONT_VER="9.0.06"
 
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2)"
-pkgver=2.02.rc1
+pkgver=2.02.rc2
 pkgrel=1
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')

manjaro-release/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Guinux <[email protected]>
 
 pkgname=manjaro-release
-pkgver=17.0
+pkgver=17.0.1
 pkgrel=1
 pkgdesc="Manjaro's release definition"
 arch=("any")
@@ -10,7 +10,7 @@ license=('GPL2')
 depends=('lsb-release')
 source=('lsb-release')
 install="manjaro-release.install"
-sha256sums=('b79ebee0b55b541a029b641b300b343bf76e2240364b45974046ee1bd82cd5d3')
+sha256sums=('b0f72b2bf91e0f470fa7cc34a01936951be47fc8a9557ff14a9293473d5eb5c1')
 
 package() {
     # Copy files

manjaro-release/lsb-release

@@ -1,4 +1,4 @@
 DISTRIB_ID=ManjaroLinux
-DISTRIB_RELEASE=17.0
+DISTRIB_RELEASE=17.0.1
 DISTRIB_CODENAME=Gellivara
 DISTRIB_DESCRIPTION="Manjaro Linux"

pacman-mirrors-dev/PKGBUILD

@@ -0,0 +1,28 @@
+# Maintainer: Guillaume <[email protected]>
+# Maintainer: Roland <[email protected]>
+# Maintainer: Philip Müller <[email protected]>
+
+_branch=master
+_date=20$(date +%y%m%d)
+pkgname=pacman-mirrors-dev
+pkgver=4.0.4
+pkgrel=0.1
+pkgdesc="Manjaro Linux mirror list for use by pacman"
+arch=('any')
+depends=('python' 'python-npyscreen')
+makedepends=('git' 'python-babel' 'python-setuptools')
+optdepends=('gtk3: for interactive mode (GUI)' 
+            'python-gobject: for interactive mode (GUI)')
+url="https://github.com/manjaro/pacman-mirrors.git"
+conflicts=('pacman-mirrorlist' 'pacman-mirrorlist-dev' 'pacman-mirrors')
+provides=("pacman-mirrorlist=$_date" "pacman-mirrors=$pkgver")
+license=('GPL')
+install=pacman-mirrors.install
+backup=(etc/pacman-mirrors.conf)
+source=(git+$url#branch=$_branch)
+sha256sums=('SKIP')
+
+package() {
+  cd "${srcdir}"/pacman-mirrors
+  make DESTDIR="${pkgdir}" install
+}

pacman-mirrors-dev/pacman-mirrors.install

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+msg() {
+    ALL_OFF="\e[1;0m"
+    BOLD="\e[1;1m"
+    GREEN="${BOLD}\e[1;32m"
+	local mesg=$1; shift
+	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+post_install() {
+	if [ -f /etc/pacman-mirrors.conf.pacsave ]; then
+		msg "use pacman-mirrorlist config"
+		mv /etc/pacman-mirrors.conf /etc/pacman-mirrors.conf.20$(date +%y%m%d).backup
+		mv /etc/pacman-mirrors.conf.pacsave /etc/pacman-mirrors.conf
+	fi
+	/usr/bin/pacman-mirrors -m random
+	message
+}
+
+
+post_upgrade() {
+	/usr/bin/pacman-mirrors -g --no-update
+	message
+}
+
+message() {
+	echo ""
+	echo "hint: use \`pacman-mirrors\` to generate and update your pacman mirrorlist."
+}

pacman-mirrors/pacman-mirrors.install

@@ -1,6 +1,19 @@
 #!/bin/sh
 
+msg() {
+    ALL_OFF="\e[1;0m"
+    BOLD="\e[1;1m"
+    GREEN="${BOLD}\e[1;32m"
+	local mesg=$1; shift
+	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
 post_install() {
+	if [ -f /etc/pacman-mirrors.conf.pacsave ]; then
+		msg "use pacman-mirrorlist config"
+		mv /etc/pacman-mirrors.conf /etc/pacman-mirrors.conf.20$(date +%y%m%d).backup
+		mv /etc/pacman-mirrors.conf.pacsave /etc/pacman-mirrors.conf
+	fi
 	/usr/bin/pacman-mirrors -g -m random
 	message
 }