Changeset 6704

Timestamp:

Jan 26, 2018, 1:15:33 PM (3 years ago)

Author:

jrpelegrina

Message:

Fix files to migration of EPI

Location:

zero-lliurex-sketchup/trunk/EPI-FILES/fuentes

Files:

• zero-lliurex-sketchup.install-files/usr/share/google-sketchup/google-sketchup.epi (modified) (1 diff)
• zero-lliurex-sketchup.install-files/usr/share/google-sketchup/google-sketchup_script (modified) (2 diffs)
• zero-lliurex-sketchup.zlaunchers/zero-lliurex-sketchup.app (modified) (1 diff)

zero-lliurex-sketchup/trunk/EPI-FILES/fuentes/zero-lliurex-sketchup.install-files/usr/share/google-sketchup/google-sketchup.epi

@@ -2 +2 @@
         "type":"file",
         "pkg_list":[{"name":"google-sketchup","version":{"all":"GoogleSketchUpWES.exe"},"key_store":"zero-lliurex-sketchup","url_download":"http://dl.google.com/sketchup/"}],
-        "script": {"name":"/usr/share/google-sketchup/google-sketchup_script","remove":true},
+        "script": {"name":"/usr/share/google-sketchup/google-sketchup_script","remove":true,"getStatus":true},
         "required_x":true,
         "required_root":true,
-        "depends":"/usr/share/zero-lliurex-wine64/wine64.epi",
-        "zomando":"zero-lliurex-sketchup"
+        "depends":"/usr/share/zero-lliurex-wine64/wine64.epi"
 
         }

zero-lliurex-sketchup/trunk/EPI-FILES/fuentes/zero-lliurex-sketchup.install-files/usr/share/google-sketchup/google-sketchup_script

@@ -3 +3 @@
 
 ACTION="$1"
+PKG="$2"
 USERHOME=$(getent passwd $USER | cut -f6 -d ':')
-DESKTOP_PATH=$USERHOME"./local/share/applicacions/wine/Programs/Google Sketchup/Google SketchUp.desktop"
+DESKTOP_PATH=$USERHOME"/.local/share/applications/wine/Programs/Google SketchUp 8/Google SketchUp.desktop"
 
 case $ACTION in
 
-        install)
+
+        getStatus)
+
+                case $PKG in
+                        
+                        google-sketchup)
+                                if [ -f "${DESKTOP_PATH}" ];then
+                                        echo 0
+                                else
+                                        echo 1
+                                fi
+                        ;;
+                esac
+        ;;              
+                                
+        installPackage)
+
                 echo "Launching installation wizard..."
+
                 su $USER -c "wine /var/cache/epi-downloads/GoogleSketchUpWES.exe"
-                if [ -f ${DESTKOP_PATH} ];then
-                        su $USER -c "regedit /usr/share/google-sketchup/hw_ok_set.reg"
-                else
-                        exit 0
+                su $USER -c "regedit /usr/share/google-sketchup/hw_ok_set.reg"
+
+                echo "Ending installation..."
+                sleep 2
+                
+                if ! [ -f "${DESKTOP_PATH}" ];then
+                        exit 1
                 fi              
 
@@ -23 +44 @@
 
                 echo "Launching uninstall wizard..."
+                
                 su $USER -c "wine uninstaller"
+                if [ -f "${DESKTOP_PATH}" ];then
+                        rm -f "${DESKTOP_PATH}"
+                fi
+
                 
         ;;      

zero-lliurex-sketchup/trunk/EPI-FILES/fuentes/zero-lliurex-sketchup.zlaunchers/zero-lliurex-sketchup.app

@@ -12 +12 @@
 Groups=adm;admins;teachers;others;students
 Using=pe
-Service=True
 Modal=True