diff options
| -rw-r--r-- | pcr/openrc-desktop/PKGBUILD | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/pcr/openrc-desktop/PKGBUILD b/pcr/openrc-desktop/PKGBUILD index 5ae796ed7..7dc28a9c5 100644 --- a/pcr/openrc-desktop/PKGBUILD +++ b/pcr/openrc-desktop/PKGBUILD @@ -14,7 +14,7 @@ pkgname=('acpid-openrc' 'bluez-openrc' 'wpa_supplicant-openrc') -pkgver=20151015 +pkgver=20151020 pkgrel=1 pkgdesc="OpenRC init scripts" arch=('any') @@ -73,10 +73,10 @@ _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \ - -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|' \ - -e 's|/var/run|/run|g' \ - -e 's|/usr/sbin|/usr/bin|g' \ - -i ${pkgdir}/etc/init.d/$1 + -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|' \ + -e 's|/var/run|/run|g' \ + -e 's|/usr/sbin|/usr/bin|g' \ + -i ${pkgdir}/etc/init.d/$1 } _inst_confd(){ @@ -124,7 +124,7 @@ package_cgmanager-openrc() { package_consolekit-openrc() { pkgdesc="OpenRC consolekit init script" - depends=('consolekit' 'dbus-openrc' 'cgmanager-openrc') + depends=('consolekit' 'dbus-openrc' 'cgmanager-openrc' 'udev-openrc') install=consolekit.install _inst_initd 'consolekit' @@ -132,9 +132,9 @@ package_consolekit-openrc() { package_displaymanager-openrc() { pkgdesc="OpenRC dm init script" - depends=('openrc' 'xorg-server' 'xorg-xinit') + depends=('openrc' 'xorg-server' 'xorg-xinit' 'udev-openrc') optdepends=('consolekit-openrc: consolekit initscript' - 'dbus-openrc: dbus initscript') + 'dbus-openrc: dbus initscript') backup=('etc/conf.d/xdm') install=displaymanager.install @@ -145,8 +145,8 @@ package_displaymanager-openrc() { install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh" sed -e 's|/etc/profile.env|/etc/profile|g' \ - -e 's|{ROOTPATH}|{PATH}|g' \ - -i "${pkgdir}/etc/init.d/xdm" + -e 's|{ROOTPATH}|{PATH}|g' \ + -i "${pkgdir}/etc/init.d/xdm" } package_gpm-openrc() { @@ -170,9 +170,8 @@ package_bluez-openrc() { _inst_initd 'rfcomm' _inst_initd 'bluetooth' - sed -e 's|/usr/sbin|/usr/lib/bluetooth|g' \ - -e 's/libexec/lib/' \ - -i "${pkgdir}/etc/init.d/bluetooth" + sed -e 's|/usr/libexec|/usr/lib|g' \ + -i "${pkgdir}/etc/init.d/bluetooth" } package_wpa_supplicant-openrc() { @@ -188,9 +187,9 @@ package_wpa_supplicant-openrc() { install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" if [[ -f /etc/os-release ]];then - . /etc/os-release - sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + . /etc/os-release + sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" else - sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" fi } |