From 1dd8a4e862981201cdd4026f085c56ebac791058 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Mon, 20 Mar 2017 05:33:31 -0500
Subject: openrc-base: use default shebang line

---
 pcr/openrc-base/PKGBUILD   | 22 +++++++++++++---------
 pcr/openrc-base/ftpd.initd |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'pcr/openrc-base')

diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index f0f92e3ea..92fc78fd7 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=('dbus-openrc'
         'lvm2-openrc'
         'mdadm-openrc')
 pkgver=20170315
-pkgrel=1
+pkgrel=1.1
 pkgdesc="OpenRC init scripts"
 arch=('any')
 url="https://github.com/manjaro/packages-openrc"
@@ -59,7 +59,7 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             '6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1'
             '00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd'
             '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
-            '7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef')
+            'b9aadae3d8bcb31df51613919c8b8cf787ce4d35fe26ce2b639e84b3a862c2e5')
 
 pkgver() {
 	date +%Y%m%d
@@ -108,7 +108,7 @@ package_dhcpcd-openrc() {
 
 	_inst_initd 'dhcpcd'
 
-	sed -e 's|/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dhcpcd"
+	sed -e 's|/sbin/dhcpcd|/usr/bin/dhcpcd|g' -i "${pkgdir}/etc/init.d/dhcpcd"
 }
 
 package_device-mapper-openrc() {
@@ -120,9 +120,8 @@ package_device-mapper-openrc() {
 	_inst_initd 'device-mapper'
 	_inst_initd 'dmeventd'
 
-	for f in ${pkgdir}/etc/init.d/*; do
-		sed -e 's|/sbin|/usr/bin|g' -i $f
-	done
+	sed -e 's|/sbin/dmsetup|/usr/bin/dmsetup|g' -i "${pkgdir}/etc/init.d/device-mapper"
+	sed -e 's|/sbin/dmeventd|/usr/bin/dmeventd|g' -i "${pkgdir}/etc/init.d/dmeventd"
 }
 
 package_cryptsetup-openrc() {
@@ -166,9 +165,14 @@ package_lvm2-openrc() {
 	_inst_initd 'lvm-monitoring'
 	_inst_initd 'lvmetad'
 
-	for f in ${pkgdir}/etc/init.d/*; do
-		sed -e 's|/sbin|/usr/bin|g' -i $f
-	done
+	sed -e 's|/sbin |/usr/bin |g' -i "${pkgdir}/etc/init.d/lvm"
+	sed -e 's|/sbin/lvm|/usr/bin/lvm|g' -i "${pkgdir}/etc/init.d/lvm"
+	sed -e 's|/sbin/vgs|/usr/bin/vgs|g' -i "${pkgdir}/etc/init.d/lvm"
+	sed -e 's|/sbin/vgchange|/usr/bin/vgchange|g' -i "${pkgdir}/etc/init.d/lvm"
+	sed -e 's|/sbin/lvchange|/usr/bin/lvchange|g' -i "${pkgdir}/etc/init.d/lvm"
+	sed -e 's|/sbin/vgchange|/usr/bin/vgchange|g' -i "${pkgdir}/etc/init.d/lvm-monitoring"
+	sed -e 's|/sbin/vgs|/usr/bin/vgs|g' -i "${pkgdir}/etc/init.d/lvm-monitoring"
+	sed -e 's|/sbin/lvmetad|/usr/bin/lvmetad|g' -i "${pkgdir}/etc/init.d/lvmetad"
 }
 
 package_mdadm-openrc() {
diff --git a/pcr/openrc-base/ftpd.initd b/pcr/openrc-base/ftpd.initd
index a53184c4c..68be16a36 100644
--- a/pcr/openrc-base/ftpd.initd
+++ b/pcr/openrc-base/ftpd.initd
@@ -1,4 +1,4 @@
-#!/usr/bin/openrc-run
+#!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-- 
cgit v1.2.3