[arch-commits] Commit in refind-efi/trunk (PKGBUILD)

[Tobias Powalowski]

    Date: Monday, October 24, 2016 @ 12:33:19
  Author: tpowa
Revision: 279201

upgpkg: refind-efi 0.10.4-2

fix #51489 #51488 #51590 #51444

Modified:
  refind-efi/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-24 12:23:07 UTC (rev 279200)
+++ PKGBUILD	2016-10-24 12:33:19 UTC (rev 279201)
@@ -15,7 +15,7 @@
 
 pkgname="refind-efi"
 pkgver="0.10.4"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager"
 url="http://www.rodsbooks.com/refind/index.html"
 arch=('x86_64' 'i686')
@@ -23,7 +23,8 @@
 
 depends=('bash' 'dosfstools' 'efibootmgr')
 optdepends=('mactel-boot: For bless command in Apple Mac systems'
-            'imagemagick: For refind-mkfont script')
+            'imagemagick: For refind-mkfont script'
+            'python: For refind-mkdefault script')
 
 options=('!strip' 'docs' '!makeflags')
 
@@ -298,8 +299,9 @@
 	msg "Install rEFInd helper scripts"
 	install -d "${pkgdir}/usr/bin/"
 	install -D -m0755 "${srcdir}/refind-${pkgver}/refind-install" "${pkgdir}/usr/bin/refind-install"
-	install -D -m0755 "${srcdir}/refind-${pkgver}/mkrlconf" "${pkgdir}/usr/bin/refind-mkrlconf"
-	install -D -m0755 "${srcdir}/refind-${pkgver}/mvrefind" "${pkgdir}/usr/bin/refind-mvrefind"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/refind-mkdefault" "${pkgdir}/usr/bin/refind-mkdefault"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/mkrlconf" "${pkgdir}/usr/bin/mkrlconf"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/mvrefind" "${pkgdir}/usr/bin/mvrefind"
 	install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont"
 	
 	msg "Install the rEFInd sample config files"
@@ -309,11 +311,12 @@
 	msg "Install the rEFInd docs"
 	install -d "${pkgdir}/usr/share/refind/docs/html/"
 	install -d "${pkgdir}/usr/share/refind/docs/Styles/"
+	install -d "${pkgdir}/usr/share/man/man8/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt"
-	rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true
+	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/man"/*.8 "${pkgdir}/usr/share/man/man8/"
 	
 	msg "Install the rEFInd fonts"
 	install -d "${pkgdir}/usr/share/refind/fonts/"
@@ -339,11 +342,9 @@
 	install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE"
 	
 	msg "Use '#!/usr/bin/env bash' in all scripts"
-	sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true
+	sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/* || true
 	
 	msg "Point refind dir paths to /usr/share/refind/ in refind-install script"
-	sed 's|^ThisDir=.*|ThisDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
-	sed 's|^RefindDir=.*|RefindDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
-	sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install"
+	sed 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install"
 	
 }