Changeset 6261 for trunk/INSTALL/arquivos/scripts/aux.sh

Timestamp:

05/22/12 00:15:30 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2557 - Correcoes no instalador conforme sugestao no forum

File:

• trunk/INSTALL/arquivos/scripts/aux.sh (modified) (2 diffs)

trunk/INSTALL/arquivos/scripts/aux.sh

@@ -83 +83 @@
                         PSUEDONAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
                         REV=`cat /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`
-                # Debian, Ubuntu e variantes, que possuem o LSB
+                # Debian, Ubuntu e variantes
                 elif [ -f /etc/debian_version ] ; then
-                        DIST=`lsb_release -si`
-                        PSEUDONAME=`lsb_release -sc`
-                        REV=`lsb_release -sr`
+                        # Verifica se o LSB esta instalado
+                        LSB=`which lsb_release`
+                        # Se nao estiver, configura no braco
+                        if [ -z "$LSB" ] ; then
+                                DIST="Debian"
+                                REV=`cat /etc/debian_version`
+                        # Se nao, usa o LSB. Ubuntu eh reconhecido aqui
+                        else
+                                DIST=`lsb_release -si`
+                                PSEUDONAME=`lsb_release -sc`
+                                REV=`lsb_release -sr`
+                        fi
                 # TODO: Validar do suse
                 elif [ -f /etc/SuSE-release ] ; then
@@ -97 +106 @@
         fi
 }
+
+qualSO
+echo $OSSTR
 
 validaSO ()