Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1ec66b5ca304538d4e8d44332e65c2c14a4b2af
commit a1ec66b5ca304538d4e8d44332e65c2c14a4b2af Author: James Buren <[email protected]> Date: Wed Jun 6 08:10:02 2012 -0500 wicd-1.7.2.4-2-x86_64 * convert to use systemd schema diff --git a/source/xapps-extra/wicd/FrugalBuild b/source/xapps-extra/wicd/FrugalBuild index 7c583dd..7b586e9 100644 --- a/source/xapps-extra/wicd/FrugalBuild +++ b/source/xapps-extra/wicd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=wicd pkgver=1.7.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A wired and wireless network manager for Linux" depends=('pygtk') makedepends=('python-distribute' 'babel') @@ -46,7 +46,7 @@ build() { --verbose \ --python=/usr/bin/python \ --lib=/usr/lib \ - --systemd=/usr/lib/systemd/system || Fdie + --systemd=/lib/systemd/system || Fdie #HACK for https://bugs.launchpad.net/wicd/+bug/928589 mkdir -p translations/ast/LC_MESSAGES || Fdie @@ -68,6 +68,7 @@ build() { Fsplit wicd-daemon usr/bin/wicd-cli Fsplit wicd-daemon usr/bin/wicd-client Fsplit wicd-daemon usr/sbin/wicd + Fsplit wicd-daemon lib/systemd/system Fsplit wicd-daemon usr/lib/ Fsplit wicd-daemon var Fsplit wicd-daemon usr/share/wicd/scripts diff --git a/source/xapps-extra/wicd/wicd.install b/source/xapps-extra/wicd/wicd.install index 89237d4..9bc1ef2 100644 --- a/source/xapps-extra/wicd/wicd.install +++ b/source/xapps-extra/wicd/wicd.install @@ -1,19 +1,48 @@ +systemd_units=(wicd=) + +print_msg() +{ + echo "To enable wicd at bootup:" + echo "systemctl disable netconfig.service" + echo "systemctl disable NetworkManager.service" + echo "systemctl enable wicd.service" +} + post_install() { - systemctl daemon-reload >/dev/null 2>&1 - systemctl enable wicd.service >/dev/null 2>&1 + print_msg + + local unit + local op + + for i in ${systemd_units[@]}; do + unit=$(echo $i | cut -f 1 -d '=') + op=$(echo $i | cut -f 2 -d '=') + if echo $op | grep -q 'e'; then + systemctl enable $unit.service >/dev/null 2>&1 + fi + if echo $op | grep -q 's'; then + systemctl start $unit.service >/dev/null 2>&1 + fi + done } post_upgrade() { + print_msg + systemctl daemon-reload >/dev/null 2>&1 - systemctl try-restart wicd.service >/dev/null 2>&1 } pre_remove() { - systemctl stop wicd.service >/dev/null 2>&1 - systemctl disable wicd.service >/dev/null 2>&1 + local unit + + for i in ${systemd_units[@]}; do + unit=$(echo $i | cut -f 1 -d '=') + systemctl --no-reload disable $unit.service >/dev/null 2>&1 + systemctl stop $unit.service >/dev/null 2>&1 + done } post_remove() @@ -23,7 +52,4 @@ post_remove() op=$1 shift - $op $* - -# vim: ft=sh _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
