Changeset 2460

Timestamp:

Sep 19, 2016, 12:27:33 PM (3 years ago)

Author:

jrpelegrina

Message:

Fix some file

Location:

lliurex-desktops-keeper/trunk/fuentes/install/usr

Files:

• sbin/lliurex-desktops-db (modified) (12 diffs)
• share/lliurex-desktops-keeper/custom-desktops/JB-javaws.desktop (modified) (1 diff)
• share/lliurex-desktops-keeper/custom-desktops/edu.media.mit.scratch2editor.desktop (added)
• share/lliurex-desktops-keeper/custom-desktops/scratch2editor.desktop (deleted)
• share/lliurex-desktops-keeper/desktops-hide/lliurex-desktops-keeper-hide (modified) (1 diff)
• share/lliurex-desktops-keeper/desktops-hide/mate-desktops (added)

lliurex-desktops-keeper/trunk/fuentes/install/usr/sbin/lliurex-desktops-db

@@ -12 +12 @@
 diversion_db="/var/lib/lliurex-desktops-keeper/lliurex-desktops.db"
 diversion_db_hide="/var/lib/lliurex-desktops-keeper/lliurex-desktops_hide.db"
+mate_db="/usr/share/lliurex-desktops-keeper/desktops-hide/mate-desktops"
 destination_path="/usr/share/applications/"
 db=[]
 db_hide=[]
+db_mate=[]
 
 
@@ -30 +32 @@
 
 
+def lookup_mate(file):
+        matefile= -1
+
+        for c in db_mate:
+                if c==file:
+                        matefile=0
+        return int(matefile)            
         
 #add command        
@@ -37 +46 @@
 
         initdb()
-
-        
-
-
+        initdb_mate()
+        
         for file in os.listdir(path):
                 match=re.match(".*\.desktop$",file)
@@ -46 +53 @@
         
                         ret=lookup(path+os.sep+file)
+                        matefile=lookup_mate(file)
 
                         if ret==-1:
@@ -51 +59 @@
                                 must_save=True
                                 db.append((path+os.sep+file,priority))
-
-                                subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add","--divert", str(destination_path+file+".diverted"),str(destination_path+file)])
+                                if matefile ==-1:
+                                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add","--divert", str(destination_path+file+".diverted"),str(destination_path+file)])
                                 shutil.copy(str(path+os.sep+file),str(destination_path+file))
                         else:
@@ -65 +73 @@
                                 if ret < priority:
                                         #print "* Inserting with a higher priority: ",file
-                                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add","--divert", str(destination_path+file+".diverted"),str(destination_path+file)])
+                                        if matefile==-1:
+                                                subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add","--divert", str(destination_path+file+".diverted"),str(destination_path+file)])
                                         shutil.copy(str(path+os.sep+file),str(destination_path+file))
                                         
@@ -146 +155 @@
 
         initdb()
+        initdb_mate()
 
         todel=[]
@@ -157 +167 @@
                 
         for file in todel:
+                matefile=lookup_mate(file)
                 if os.path.exists(destination_path+file+".diverted"):
 
@@ -165 +176 @@
                         subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--remove",str(destination_path+file)])
         
+                else:
+                        if matefile==0:
+                                if os.path.exists(destination_path+file):
+                                #print "* Removing:",file
+                                        os.remove(destination_path+file)        
+
         #print "* Removing db file"
         os.remove(diversion_db)
@@ -183 +200 @@
 
                 for line in hide_desktop_file:
-                                xfile=line.strip()
+                        xfile=line.strip()
+                        must_save=True
+                        db_hide.append(xfile)
                         
-                                if os.path.exists(xfile):
-                                        
-                                        must_save=True
-                                        db_hide.append(xfile)
-                                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add", "--divert",str(xfile+".diverted"),str(xfile)])
-
-                                if must_save:
-                        #sa database
-                                        dbfile=open(diversion_db_hide,"w+")
-                                        for c in db_hide:
-                                                dbfile.write(c+"\n")
-
-                                        dbfile.close()
+                        if not (os.path.exists(xfile +".diverted")) and xfile!="":
+
+                                subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--add", "--divert",str(xfile+".diverted"),str(xfile)])
+
+                        if must_save:
+                        #saving database
+                                dbfile=open(diversion_db_hide,"w+")
+                                for c in db_hide:
+                                        dbfile.write(c+"\n")
+                                dbfile.close()
         
                 hide_desktop_file.close()
@@ -215 +231 @@
         for line in toshow:
                 xfile=line.strip()
-                if os.path.exists(line+".diverted"):
-                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--remove",str(line)])
+                if os.path.exists(xfile+".diverted"):
+                        subprocess.call(["dpkg-divert","--package","lliurex-desktops-keeper","--rename","--quiet","--remove",str(xfile)])
         
         #print "* Removing db file"
@@ -258 +274 @@
 
 
+def initdb_mate():
+        global db_mate
+        if os.path.exists(mate_db):
+                mate_file=open(mate_db,"r")
+                for line in mate_file:
+                        tmp=line.split("/")
+                        if (len(tmp)>1):
+                                db_mate.append(tmp[5].strip())
+                mate_file.close()                       
 
             

lliurex-desktops-keeper/trunk/fuentes/install/usr/share/lliurex-desktops-keeper/custom-desktops/JB-javaws.desktop

@@ -20 +20 @@
 X-GNOME-Settings-Panel=Oracle Java 7 Web Start
 X-Unity-Settings-Panel=Oracle Java 7 Web Start
-Categories=Sytem;
+Categories=System;
 

lliurex-desktops-keeper/trunk/fuentes/install/usr/share/lliurex-desktops-keeper/desktops-hide/lliurex-desktops-keeper-hide

@@ -29 +29 @@
 /usr/share/applications/JB-mission-control-jdk9.desktop
 /usr/share/applications/mugshot.desktop
-/usr/share/mate/applications/edu.media.mit.scratch2editor.desktop
-/usr/share/applications/edu.media.mit.scratch2editor.desktop