From 1829a21e9550c50c491a779786a89e97fcb18eab Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 24 Jun 2011 14:33:07 +0200 Subject: [PATCH] openmamba-netsrpms: remove dependency on kdialog by using license-dialog and notify-send --- openmamba-update/openmamba-netsrpms | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/openmamba-update/openmamba-netsrpms b/openmamba-update/openmamba-netsrpms index a2a09e9..71c04b5 100755 --- a/openmamba-update/openmamba-netsrpms +++ b/openmamba-update/openmamba-netsrpms @@ -32,19 +32,16 @@ fi function check_if_already_installed() { rpm -q $1 &>/dev/null if [ $? -eq 0 ]; then - kdialog \ - --caption "$pckname" \ - --msgbox "$pckname: "$"already installed." + notify-send -i $icon "$pckname" "$pckname: "$"already installed." else - kdialog \ - --caption "$pckname" \ - --sorry $"There was an error installing"" $pckname!" + notify-send -i $icon "$pckname" $"There was an error installing"" $pckname!" fi } - for pckname in $PACKAGES; do + icon=`grep Icon= /usr/share/applications/openmamba-$pckname.desktop | sed "s|Icon=||"` + SRPM_NAME=`\ find $DISTRO_SRPMS_DIR \ -regex ".*/${pckname//+/\\+}-[^-]*-[^-]*" -printf "%f " 2>/dev/null` @@ -104,16 +101,11 @@ for pckname in $PACKAGES; do cpio --quiet --extract --make-directories < $tmpfile ) 2>/dev/null if [ -f $tmpdir/LICENSE ]; then - kdialog \ - --caption "LICENSE" \ - --textbox $tmpdir/LICENSE 600 400 + license-dialog $tmpdir/LICENSE [ $? -ne 0 ] && exit 1 fi - kdialog \ - --title "$pckname" \ - --passivepopup \ - $"$pckname installation in progress..." + notify-send -i $icon "$pckname" $"$pckname installation in progress..." # build rpm echo "$me: "$"rebuilding package \`$SRPM_PATH'..." @@ -135,14 +127,9 @@ for pckname in $PACKAGES; do rpm -q $pckname 2>/dev/null if [ $? -eq 0 ]; then - kdialog \ - --title "$pckname" \ - --passivepopup \ - $"Installation of $pckname successfully completed." + notify-send -i $icon "$pckname" $"Installation of $pckname successfully completed." else - kdialog \ - --caption "$pckname" \ - --sorry $"There was an error installing $pckname!" + notify-send -i $icon "$pckname" $"There was an error installing $pckname!" fi rm -rf $tmpdir $tmpfile