From b93f2d45cd68b55998b2854d196917db4243e1d6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 16 Dec 2011 10:34:46 +0100 Subject: [PATCH] xbps-triggers: virtualpkg: better regexp, do nothing in update case. --- srcpkgs/xbps-triggers/files/virtualpkg | 10 +++++++--- srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xbps-triggers/files/virtualpkg b/srcpkgs/xbps-triggers/files/virtualpkg index 26eecb08c80..135ee756425 100755 --- a/srcpkgs/xbps-triggers/files/virtualpkg +++ b/srcpkgs/xbps-triggers/files/virtualpkg @@ -25,11 +25,15 @@ run) [ -z "$CONF_FILE" ] && CONF_FILE=etc/xbps/xbps.conf [ ! -w $CONF_FILE ] && exit 0 - if [ "${TARGET}" = "post-install" -a "$UPDATE" = "no" ]; then + if [ "${TARGET}" = "post-install" ]; then + if [ "$UPDATE" = "yes" ]; then + # do nothing + exit 0 + fi echo "Enabled $PKGNAME virtual packages to $CONF_FILE." - echo "include(/etc/xbps/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 + sed -i "/^include.*${PKGNAME}\.conf.*$/d" ./$CONF_FILE echo "Disabled $PKGNAME virtual packages from $CONF_FILE." fi ;; diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index a224e062618..8651c091370 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.36 +version=0.37 short_desc="XBPS triggers" maintainer="Juan RP " homepage="http://code.google.com/p/xbps"