Changeset 4802

Timestamp:

May 16, 2017, 2:58:42 PM (2 years ago)

Author:

daduve

Message:

Updating script

File:

• zero-lliurex-s4a/trunk/fuentes/zero-lliurex-s4a.zlaunchers/zero-lliurex-s4a.zmd (modified) (6 diffs)

zero-lliurex-s4a/trunk/fuentes/zero-lliurex-s4a.zlaunchers/zero-lliurex-s4a.zmd

@@ -1 +1 @@
 #!/bin/bash
-
+set -e
 export TEXTDOMAIN="zero-lliurex-s4a"
 MSG_NO_INTERNET=$(gettext "No Internet Connection has been detected. Please, check it")
@@ -16 +16 @@
         echo "Internet is ok...........continue"
 else
+        echo "jjjjjjj"
         ######NO TENEMOS CONEXION A INTERNET
         zenity --error --text="$MSG_NO_INTERNET" > /dev/null 2>&1
@@ -22 +23 @@
         exit 1
 
-
+fi
 ###### COMPROBAMOS SI ES PARA 64 BITS O 32 Y ELEGIMOS INSTALACION EN CADA CASO
 
@@ -39 +40 @@
         
         dpkg --add-architecture i386
+        zero-repos-update || true
 
         
@@ -51 +53 @@
 echo "libpulse0:i386 install" >> /tmp/list64.txt
 echo "libasound2:i386 install" >> /tmp/list64.txt
-echo "s4a" >> /tmp/list64.txt
+echo "s4a install" >> /tmp/list64.txt
 
-zero-installer -l /tmp/list64.txt
+zero-installer -l /tmp/list64.txt || true
 
-if [ $? -ne 0 ]
-then
-        
-        zenity --info --title="Zero-installer" --text="For some reason some packages couldn't be installed. View details in /tmp/zero-list64.txt.log " > /dev/null 2>&1 &
-        echo
-        echo "Some or any packages are not installed"
-        echo
+######COMPROBAMOS QUE LA LISTA SE INSTALO BIEN ABORTANDO EL PROCESO SI FALLO ALGUN PAQUETE
+
+
+# Comprobacion que faltaba algun paquete en el repositorio
+if  [ $(rgrep "in your repositories" /tmp/zero-installer.log) ]; then
+        echo "We can't install some packages from your repository view details in /tmp/zero-install.log" 
+        zenity --info --title="Zero-installer" --text="We can't install some packages from your repository view details in /tmp/zero-install.log " > /dev/null 2>&1 &
+        zero-center set-non-configured zero-lliurex-s4a
+        zero-center remove-pulsating-color zero-lliurex-s4a
         exit 1
 fi
-
-######COMPROBAMOS QUE LA LISTA SE INSTALO BIEN ABORTANDO EL PROCESO SI FALLO ALGUN PAQUETE
-fgrep "is not in repository" /tmp/zero-list64.txt.log 
-
-# Comprobacion que faltaba algun paquete en el repositorio
-if  [ "$?" == "0" ]; then
-        zenity --info --title="Zero-installer" --text="We can't install some packages from your repository view details in /tmp/zero-list64.txt.log " > /dev/null 2>&1 &
-        exit 1
-fi
-
-#Comprobacion de que los paquetes estan instalados sin problemas.
-
-for PACKET in $( cat /tmp/list64.txt | awk '{print$1}' )
-do
-        PKG_OK=$(dpkg-query -W --showformat='${Status}\n'  $PACKET | grep "install ok installed")
-        if [ "" == "$PKG_OK" ]; then
-                zenity --info --title="Zero-installer" --text="We can't install some packages from your repository view details in /tmp/zero-list64.txt.log " > /dev/null 2>&1 &
-                echo
-                echo "Some or any packages are not installed"
-                echo
-                zero-center set-non-configured zero-lliurex-s4a
-                zero-center remove-pulsating-color zero-lliurex-s4a
-                exit 1
-        fi
-done
                 
                         
@@ -94 +73 @@
         
 
-
+echo "Correct you have installed all you need for S4A, congratulations!!"
 zero-center remove-pulsating-color zero-lliurex-s4a
 zero-center set-configured zero-lliurex-s4a