Changeset 8703 for lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share

Timestamp:

Jun 26, 2019, 12:34:25 AM (20 months ago)

Author:

Juanma

Message:

sync with git

Location:

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore

Files:

• plugins/appImageManager.py (modified) (2 diffs)
• plugins/shManager.py (modified) (2 diffs)
• plugins/snapManager.py (modified) (3 diffs)
• plugins/zmdManager.py (modified) (3 diffs)
• storeManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/appImageManager.py

@@ -32 +32 @@
                 self.icons_dir=self.cache_dir+"/icons"
                 self.cache_xmls=self.cache_dir+"/xmls/appimage"
-                self.appimage_dir=os.getenv("HOME")+"/.local/bin"
+                self.appimage_dir=os.getenv("HOME")+"/Applications"
+                #Prevent appimage desktop integration
+                if not os.path.isfile("%s/.local/share/appimagekit/no_desktopintegration"%os.environ['HOME']):
+                        if not os.path.isdir("%s/.local/share/appimagekit/"%os.environ['HOME']):
+                                os.makedirs("%s/.local/share/appimagekit/"%os.environ['HOME'])
+                        try:
+                                f=open("%s/.local/share/appimagekit/no_desktopintegration"%os.environ['HOME'],'w')
+                                f.close()
+                        except Exception as e:
+                                self._debug("Couldn't create %s"%"%s/.local/share/appimagekit/no_desktopintegration"%os.environ['HOME'])
+                                self._debug("Reason: 5s"%e)
                 #To get the description of an app we must go to a specific url defined in url_info.
                 #$(appname) we'll be replaced with the appname so the url matches the right one.
@@ -158 +168 @@
                                                         self._callback(acumbf,app_size)
                                         st = os.stat(dest_path)
-                                        os.chmod(dest_path, st.st_mode | 0o111)
+                                        os.chmod(dest_path, st.st_mode | 0o755)
                                         self._set_status(0)
                                 except Exception as e:

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/shManager.py

@@ -80 +80 @@
                         err=0
                         try:
-                                sudo_cmd=['gksudo',dest_path]
+#                               sudo_cmd=['gksudo',dest_path]
+                                sudo_cmd=['pkexec',dest_path]
                                 #self._debug("executing "+str(sudo_cmd))
                                 launched_cmd=subprocess.Popen(sudo_cmd,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
@@ -101 +102 @@
                         except subprocess.CalledProcessError as callError:
 #                               err=callError.returncode
-                                #if gksudo fails set "permission denied" error
+                                #if authentication fails set "permission denied" error
                                 err=303
                         except Exception as e:

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/snapManager.py

@@ -276 +276 @@
                 stable_pkgs=[]
                 for section in sections:
-                        apps=self.snap_client.find_section_sync(Snapd.FindFlags.MATCH_NAME,section,None)
+                        apps,curr=self.snap_client.find_section_sync(Snapd.FindFlags.MATCH_NAME,section,None)
                         for pkg in apps:
                                 stable_pkgs.append(pkg)
@@ -292 +292 @@
                 while 'Snapd' not in str(type(wrap)):
                         time.sleep(0.1)
-                snaps=self.snap_client.find_finish(wrap)
+                snaps,curr=self.snap_client.find_finish(wrap)
                 if type(snaps)!=type([]):
                         pkgs=[snaps]
@@ -315 +315 @@
                 pkgs=None
                 try:
-                        pkgs=self.snap_client.find_sync(Snapd.FindFlags.MATCH_NAME,tokens,None)
+                        pkgs,curr=self.snap_client.find_sync(Snapd.FindFlags.MATCH_NAME,tokens,None)
                 except Exception as e:
                         print("ERR: %s"%e)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/zmdManager.py

@@ -67 +67 @@
                         except:
                                 self.disabled=True
-                                print("ERROR2!!!!")
                                 self._set_status(10)
                 self.progress=100
@@ -98 +97 @@
                                 err=0
                                 try:
-                                        zmd_sudo=['pe',zmd]
+                                        zmd_sudo=['pkexec',zmd]
                                         #self._debug("executing "+str(zmd_sudo))
                                         launched_zmd=subprocess.Popen(zmd_sudo,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
@@ -161 +160 @@
                         f3.close()
                         os.chmod(zmd_script,stat.S_IEXEC|stat.S_IREAD|stat.S_IWRITE|stat.S_IROTH|stat.S_IWOTH|stat.S_IXOTH|stat.S_IRGRP|stat.S_IWGRP|stat.S_IXGRP)
-                        zmd_sudo=['gksudo',zmd_script]
+#                       zmd_sudo=['gksudo',zmd_script]
+                        zmd_sudo=['pkexec',zmd_script]
                         try:
-                                #self._debug("Executing "+str(zmd_sudo))
+                                self._debug("Executing "+str(zmd_sudo))
                                 zmd_launcher=os.path.basename(zmd)
                                 zmd_launcher=os.path.splitext(zmd_launcher)[0]

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -29 +29 @@
                 self._propagate_dbg=False
                 self.store=None
-                self.stores={}
+                self.cache="%s/.cache/lliurex-store"%os.environ['HOME']
+                self.cache_data="%s/data"%self.cache
+                if not os.path.isdir(self.cache_data):
+                        os.makedirs(self.cache_data)
+                self.cache_completion="%s/bash_completion"%self.cache_data
                 self.related_actions={
                                         'load':['load'],
@@ -487 +491 @@
                 while store_pool.qsize():
                         self.store=store_pool.get()
+                with open(self.cache_completion,'w') as f:
+                        for app in self.store.get_apps():
+                                f.write("%s\n"%app.get_pkgname_default())
+
         #def _load_Store