Revision: 53975
http://brlcad.svn.sourceforge.net/brlcad/?rev=53975&view=rev
Author: jordisayol
Date: 2012-12-04 12:29:52 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Improve Linux install/remove scripts to set mged as Gnome default app.
Modified Paths:
--------------
brlcad/trunk/misc/debian/brlcad.postinst
brlcad/trunk/misc/debian/brlcad.postrm
brlcad/trunk/sh/make_rpm.sh
Modified: brlcad/trunk/misc/debian/brlcad.postinst
===================================================================
--- brlcad/trunk/misc/debian/brlcad.postinst 2012-12-04 12:13:22 UTC (rev
53974)
+++ brlcad/trunk/misc/debian/brlcad.postinst 2012-12-04 12:29:52 UTC (rev
53975)
@@ -1,17 +1,24 @@
#!/bin/sh
F="/usr/share/applications/defaults.list"
+G="/etc/gnome/defaults.list"
+H="mged.desktop"
-if [ ! -f $F ]
+if [ ! -f $F ] && [ ! -h $F ]
then
- echo "[Default Applications]" > $F
-else
- sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F
+ if [ -f $G ]
+ then
+ ln -s $G $F || :
+ else
+ echo "[Default Applications]" > $F || :
+ fi
fi
-echo "application/brlcad-v4=mged.desktop" >> $F
-echo "application/brlcad-v5=mged.desktop" >> $F
+sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F || :
-source /etc/profile.d/brlcad.sh
+echo "application/brlcad-v4=$H" >> $F || :
+echo "application/brlcad-v5=$H" >> $F || :
+source /etc/profile.d/brlcad.sh || :
+
update-mime-database /usr/share/mime || :
Modified: brlcad/trunk/misc/debian/brlcad.postrm
===================================================================
--- brlcad/trunk/misc/debian/brlcad.postrm 2012-12-04 12:13:22 UTC (rev
53974)
+++ brlcad/trunk/misc/debian/brlcad.postrm 2012-12-04 12:29:52 UTC (rev
53975)
@@ -2,9 +2,14 @@
F="/usr/share/applications/defaults.list"
-if [ -f $F ]
+if [ -f $F ] || [ -h $F ]
then
- sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F
+ sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F || :
fi
+if [ -f $F ] && [ -z "$(sed "/\[Default Applications\]/d" $F)" ]
+then
+ rm $F || :
+fi
+
update-mime-database /usr/share/mime || :
Modified: brlcad/trunk/sh/make_rpm.sh
===================================================================
--- brlcad/trunk/sh/make_rpm.sh 2012-12-04 12:13:22 UTC (rev 53974)
+++ brlcad/trunk/sh/make_rpm.sh 2012-12-04 12:29:52 UTC (rev 53975)
@@ -227,19 +227,26 @@
%post
F="/usr/share/applications/defaults.list"
+G="/etc/gnome/defaults.list"
+H="mged.desktop"
-if [ ! -f $F ]
+if [ ! -f $F ] && [ ! -h $F ]
then
- echo "[Default Applications]" > $F
-else
- sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F
+ if [ -f $G ]
+ then
+ ln -s $G $F || :
+ else
+ echo "[Default Applications]" > $F || :
+ fi
fi
-echo "application/brlcad-v4=mged.desktop" >> $F
-echo "application/brlcad-v5=mged.desktop" >> $F
+sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F || :
-source /etc/profile.d/brlcad.sh
+echo "application/brlcad-v4=$H" >> $F || :
+echo "application/brlcad-v5=$H" >> $F || :
+source /etc/profile.d/brlcad.sh || :
+
update-mime-database /usr/share/mime || :
update-desktop-database -q || :
gtk-update-icon-cache -qf /usr/share/icons/hicolor || :' >> $TMPDIR/brlcad.spec
@@ -253,11 +260,16 @@
F="/usr/share/applications/defaults.list"
-if [ $1 -eq 0 ] && [ -f $F ]
+if [ -f $F ] || [ -h $F ]
then
- sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F
+ sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F || :
fi
+if [ -f $F ] && [ -z "$(sed "/\[Default Applications\]/d" $F)" ]
+then
+ rm $F || :
+fi
+
update-mime-database /usr/share/mime || :
update-desktop-database -q || :
gtk-update-icon-cache -qf /usr/share/icons/hicolor || :' >> $TMPDIR/brlcad.spec
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
