Mon Jul 15 01:25:50 PDT 2013

2 files changed, 20 insertions, 16 deletions

diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 1b5a1435d..0617d298d 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189851 2013-07-09 13:36:09Z tpowa $
+# $Id: PKGBUILD 190083 2013-07-14 18:32:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -17,16 +17,15 @@ _COMPILER="GCC46"
 
 pkgname="refind-efi"
 pkgver="0.7.1"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
 arch=('x86_64' 'i686')
 license=('GPL3' 'custom')
 
 makedepends=('subversion' 'python2')
-depends=('dosfstools' 'efibootmgr')
+depends=('bash' 'dosfstools' 'efibootmgr')
 optdepends=('mactel-boot: For bless command in Apple Mac systems'
-            'bash: For refind-mkfont script'
             'imagemagick: For refind-mkfont script')
 
 options=('!strip' 'docs' '!makeflags')
@@ -191,29 +190,34 @@ package() {
 	install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi"
 	
+	msg "Install rEFInd helper scripts"
+	install -d "${pkgdir}/usr/bin/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind"
+	install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont"
+	
+	sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true
+	
 	msg "Install the rEFInd config file"
 	install -d "${pkgdir}/usr/lib/refind/config/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf"
 	install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf"
 	
 	msg "Install the rEFInd docs"
-	install -d "${pkgdir}/usr/share/refind/docs/html/"
-	install -d "${pkgdir}/usr/share/refind/docs/Styles/"
-	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"
-	install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS"
-	rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true
+	install -d "${pkgdir}/usr/share/doc/refind/html/"
+	install -d "${pkgdir}/usr/share/doc/refind/Styles/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/doc/refind/html/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/doc/refind/Styles/"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/doc/refind/README"
+	install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/doc/refind/NEWS"
+	rm -f "${pkgdir}/usr/share/doc/refind/html/.DS_Store" || true
 	
 	msg "Install the rEFInd fonts"
 	install -d "${pkgdir}/usr/share/refind/fonts/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/fonts"/* "${pkgdir}/usr/share/refind/fonts/"
 	rm -f "${pkgdir}/usr/share/refind/fonts/mkfont.sh"
 	
-	msg "Install the rEFInd mkfont.sh"
-	install -d "${pkgdir}/usr/bin/"
-	install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont"
-	
 	msg "Install the rEFInd icons"
 	install -d "${pkgdir}/usr/share/refind/icons/"
 	install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/usr/share/refind/icons/"
diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install
index e43f6cb61..51ac087fe 100644
--- a/extra/refind-efi/refind-efi.install
+++ b/extra/refind-efi/refind-efi.install
@@ -15,7 +15,7 @@ and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs
 rEFInd Icons have been installed at /usr/share/refind/icons/
 rEFInd Fonts have been installed at /usr/share/refind/fonts/
 
-HTML Documentation is available at /usr/share/refind/docs/html/
+HTML Documentation is available at /usr/share/doc/refind/html/
 
 More info: https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd