Revision: 54019
          http://brlcad.svn.sourceforge.net/brlcad/?rev=54019&view=rev
Author:   jordisayol
Date:     2012-12-07 03:17:36 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Use "mimeapps.list" instead "defaults.list" on Debian install and remove scripts

Modified Paths:
--------------
    brlcad/trunk/misc/debian/brlcad.postinst
    brlcad/trunk/misc/debian/brlcad.postrm

Modified: brlcad/trunk/misc/debian/brlcad.postinst
===================================================================
--- brlcad/trunk/misc/debian/brlcad.postinst    2012-12-07 03:14:19 UTC (rev 
54018)
+++ brlcad/trunk/misc/debian/brlcad.postinst    2012-12-07 03:17:36 UTC (rev 
54019)
@@ -1,24 +1,28 @@
 #!/bin/sh
 
-F="/usr/share/applications/defaults.list"
-G="/etc/gnome/defaults.list"
-H="mged.desktop"
+file="/usr/share/applications/mimeapps.list"
+section="Added Associations"
+app="mged.desktop;archer.desktop;rtwizard.desktop;"
+key_v4="application/brlcad-v4=$app"
+key_v5="application/brlcad-v5=$app"
 
-if [ ! -f $F ] && [ ! -h $F ]
+if [ ! -e $file ]
 then
-       if [ -f $G ]
+       touch $file || :
+fi
+
+if [ -f $file ]
+then
+       sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $file || :
+       line=$(sed -n "/^\[$section\]/=" $file | tail -1) || :
+       if [ -z "$line" ]
        then
-               ln -s $G $F || :
+               echo "[$section]\n$key_v4\n$key_v5" >> $file || :
        else
-               echo "[Default Applications]" > $F || :
+               sed --follow-symlinks -i "$line a$key_v4\n$key_v5" $file || :
        fi
 fi
 
-sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F || :
-
-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-07 03:14:19 UTC (rev 
54018)
+++ brlcad/trunk/misc/debian/brlcad.postrm      2012-12-07 03:17:36 UTC (rev 
54019)
@@ -1,15 +1,15 @@
 #!/bin/sh
 
-F="/usr/share/applications/defaults.list"
+file="/usr/share/applications/mimeapps.list"
 
-if [ -f $F ] || [ -h $F ]
+if [ -f $file ]
 then
-       sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $F || :
+       sed --follow-symlinks -i "/application\/brlcad-v[45]/d" $file
 fi
 
-if [ -f $F ] && [ -z "$(sed "/\[Default Applications\]/d" $F)" ]
+if [ -f $file ] && [ -z "$(sed "/\[Added Associations\]/d" $file)" ]
 then
-       rm $F || :
+       rm $file || :
 fi
 
 update-mime-database /usr/share/mime || :

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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to