Pequeños cambios en instalador: crear algunos mensjaes de aviso en vez de error y dejar de copiar el instalador del ticket para WOL Unicast.

git-svn-id: https://opengnsys.es/svn/branches/version1.0@4321 a21b9725-9963-47de-94b9-378ad31fedc9

1 files changed, 10 insertions, 4 deletions

diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index a8442456..c19f33f2 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -314,6 +314,14 @@ function errorAndLog()
 	echo "$DATETIME;$SSH_CLIENT;ERROR: $1" >> $LOG_FILE
 }
 
+# Escribe a fichero y muestra mensaje de aviso
+function warningAndLog()
+{
+	local DATETIME=`getDateTime`
+	echo "ERROR: $1"
+	echo "$DATETIME;$SSH_CLIENT;Warning: $1" >> $LOG_FILE
+}
+
 # Comprueba si el elemento pasado en $2 está en el array $1
 function isInArray()
 {
@@ -459,7 +467,7 @@ function backupFile()
 	local dateymd=`date +%Y%m%d`
 
 	if [ ! -f "$file" ]; then
-		errorAndLog "${FUNCNAME}(): file $file doesn't exists"
+		warningAndLog "${FUNCNAME}(): file $file doesn't exists"
 		return 1
 	fi
 
@@ -1270,7 +1278,6 @@ function copyServerFiles ()
 			admin/Sources/Services/ogAdmRepoAux
 			installer/opengnsys_uninstall.sh \
 			installer/opengnsys_update.sh \
-			installer/install_ticket_wolunicast.sh \
 			doc )
 	local TARGETS=( tftpboot \
 			bin \
@@ -1279,7 +1286,6 @@ function copyServerFiles ()
 			sbin \
 			lib \
 			lib \
-			lib \
 			doc )
 
 	if [ ${#SOURCES[@]} != ${#TARGETS[@]} ]; then
@@ -1299,7 +1305,7 @@ function copyServerFiles ()
 			echoAndLog "Copying content of ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}"
 			cp -a "${SOURCES[$i]}"/* "${path_opengnsys_base}/${TARGETS[$i]}"
         else
-			echoAndLog "Warning: Unable to copy ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}"
+			warningAndLog "Unable to copy ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}"
 		fi
 	done
 	popd