From: Alan Kennedy <kennedya@3dgames.com.ar>
Date: Sun, 24 Oct 2004 20:07:43 +0000 (+0000)
Subject: Bugfix si el dir de instalacion contenia numeros similares a los numeros de linea... 
X-Git-Tag: svn_import~61
X-Git-Url: https://git.llucax.com/z.facultad/75.08/llamadas.git/commitdiff_plain/740b6fd4701082cda789d4a30f127a8744d31468?ds=sidebyside;hp=d6aa2230a9b88661f5f8c746bd4b191bcff240f1

Bugfix si el dir de instalacion contenia numeros similares a los numeros de linea de el afinstal.conf
---

diff --git a/afinstal b/afinstal
index f759c3f..9eff2e5 100755
--- a/afinstal
+++ b/afinstal
@@ -86,7 +86,7 @@ MARCA
 		echo "*  Aficonf instalado el $fechaconf por $userconf"
 	fi
 	if [ "$havemonio" -eq 1 ]; then
-		echo "*  Afimonio instalado el $fechaconf por $usermonio"
+		echo "*  Afimonio instalado el $fechamonio por $usermonio"
 	fi
 cat <<MARCA
 *
@@ -207,35 +207,35 @@ done
 # [STEP3] Chequeamos si hay componentes ya instalados
 if [ -f "$CONFFILE" ] && [ -s "$CONFFILE" ]; then
 	#Busco los nombres de los binarios
-	binfraude=`grep -n "Comando" "$CONFFILE" | grep 10 | sed s%.*Comando.%%`
-	binconf=`grep -n "Comando" "$CONFFILE" | grep 20 | sed s%.*Comando.%%`
-	binmonio=`grep -n "Comando" "$CONFFILE" | grep 30 | sed s%.*Comando.%%`
+	binfraude=`grep -n "Comando" "$CONFFILE" | grep '^10' | sed s%.*Comando.%%`
+	binconf=`grep -n "Comando" "$CONFFILE" | grep '^20' | sed s%.*Comando.%%`
+	binmonio=`grep -n "Comando" "$CONFFILE" | grep '^30' | sed s%.*Comando.%%`
 	#Busco donde deberian estar instalados
-	dirfraude=`grep -n "BINDIR" "$CONFFILE" | grep 11 | sed 's%.*= %%'`
-	dirconf=`grep -n "BINDIR" "$CONFFILE" | grep 21 | sed 's%.*= %%'`
-	dirmonio=`grep -n "BINDIR" "$CONFFILE" | grep 31 | sed 's%.*= %%'`
+	dirfraude=`grep -n "BINDIR" "$CONFFILE" | grep '^11' | sed 's%.*= %%'`
+	dirconf=`grep -n "BINDIR" "$CONFFILE" | grep '^21' | sed 's%.*= %%'`
+	dirmonio=`grep -n "BINDIR" "$CONFFILE" | grep '^31' | sed 's%.*= %%'`
 	# Verifico finalmente si esta alli el archivo, en caso negativo, habilito
 	# la posibilidad de instalar ese componente
 	if [ ! -f "${dirmonio}/$binmonio" ]; then
 		choices="AFIMONIO"
 	else
 		havemonio=1
-		usermonio=`grep -n "USERID" "$CONFFILE" | grep 35 | sed 's%.*= %%'`
-		fechamonio=`grep -n "FECINS" "$CONFFILE" | grep 36 | sed 's%.*= %%'`
+		usermonio=`grep -n "USERID" "$CONFFILE" | grep '^35' | sed 's%.*= %%'`
+		fechamonio=`grep -n "FECINS" "$CONFFILE" | grep '^36' | sed 's%.*= %%'`
 	fi
 	if [ ! -f "${dirconf}/$binconf" ]; then
 		choices="${choices} AFICONF"
 	else
 		haveconf=1
-		userconf=`grep -n "USERID" "$CONFFILE" | grep 25 | sed 's%.*= %%'`
-		fechaconf=`grep -n "FECINS" "$CONFFILE" | grep 26 | sed 's%.*= %%'`
+		userconf=`grep -n "USERID" "$CONFFILE" | grep '^25' | sed 's%.*= %%'`
+		fechaconf=`grep -n "FECINS" "$CONFFILE" | grep '^26' | sed 's%.*= %%'`
 	fi
 	if [ ! -f "${dirfraude}/$binfraude" ]; then
 		choices="${choices} ANTIFRAUDE"
 	else
 		havefraude=1
-		userfraude=`grep -n "USERID" "$CONFFILE" | grep 17 | sed 's%.*= %%'`
-		fechafraude=`grep -n "FECINS" "$CONFFILE" | grep 18 | sed 's%.*= %%'`
+		userfraude=`grep -n "USERID" "$CONFFILE" | grep '^17' | sed 's%.*= %%'`
+		fechafraude=`grep -n "FECINS" "$CONFFILE" | grep '^18' | sed 's%.*= %%'`
 	fi
 	choices=${choices% }
 	choices=${choices# }