openmamba-netsrpms: remove dependency on kdialog by using license-dialog and notify-send
This commit is contained in:
parent
e7345535b2
commit
1829a21e95
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user