From 2f1019234e627dcef766aac99610eedc3dcab5aa Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 16 Dec 2011 09:47:44 +0100 Subject: [PATCH] xbps-triggers: virtualpkg: hardcode xbps confdir for now. --- srcpkgs/xbps-triggers/files/virtualpkg | 6 ++---- srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xbps-triggers/files/virtualpkg b/srcpkgs/xbps-triggers/files/virtualpkg index c40dea5e669..26eecb08c80 100755 --- a/srcpkgs/xbps-triggers/files/virtualpkg +++ b/srcpkgs/xbps-triggers/files/virtualpkg @@ -25,11 +25,9 @@ run) [ -z "$CONF_FILE" ] && CONF_FILE=etc/xbps/xbps.conf [ ! -w $CONF_FILE ] && exit 0 - confdir=$(dirname "/$CONF_FILE") - - if [ "${TARGET}" = "post-install" ]; then + if [ "${TARGET}" = "post-install" -a "$UPDATE" = "no" ]; then echo "Enabled $PKGNAME virtual packages to $CONF_FILE." - echo "include($confdir/virtualpkg.d/$PKGNAME.conf)" >> $CONF_FILE + echo "include(/etc/xbps/virtualpkg.d/$PKGNAME.conf)" >> $CONF_FILE else sed -i "/include.*$PKGNAME.conf.*/d" $CONF_FILE echo "Disabled $PKGNAME virtual packages from $CONF_FILE." diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index e995a9a5aca..a224e062618 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.35 +version=0.36 short_desc="XBPS triggers" maintainer="Juan RP " homepage="http://code.google.com/p/xbps"