From fd1e09fb3ccd1875bc65d8ad0a18c0a20ed93e6a Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Mon, 4 Mar 2013 13:35:31 +0000
Subject: [PATCH] =?UTF-8?q?#245=20#573=20#574:=20Boot-tools=20para=20nuevo?=
 =?UTF-8?q?=20cliente=20ogLive=20incluye=20Browser=20con=20soporte=20HTTPS?=
 =?UTF-8?q?=20y=20teclado=20internacional,=20pero=20no=20a=C3=B1ade=20sopo?=
 =?UTF-8?q?rte=20para=20la=20rama=20discontinuada=20de=20OG2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.0@3656 a21b9725-9963-47de-94b9-378ad31fedc9
---
 .../bin/boot-tools/boottoolsFsOpengnsys.sh    | 60 ++++++-------------
 1 file changed, 17 insertions(+), 43 deletions(-)

diff --git a/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh b/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
index 6f69809..b1c8911 100755
--- a/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
+++ b/includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
@@ -17,7 +17,6 @@ NAMEHOSTCLIENTFILE="/tmp/opengnsys_chroot"
 SVNCLIENTDIR=/tmp/opengnsys_installer/opengnsys/client/boot-tools
 SVNCLIENTSTRUCTURE=/tmp/opengnsys_installer/opengnsys/client/shared
 SVNCLIENTENGINE=/tmp/opengnsys_installer/opengnsys/client/engine
-SVNOG2=/tmp/opengnsys_installer/opengnsys2
  
 OGCLIENTMOUNT=""
 
@@ -63,55 +62,30 @@ then
 	exit 1
 fi
 
-# copiamos algunas cosas del nfsexport
 
-#### Tipos de letra para el Browser.
-cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/lib/fonts
-#### Crear enlaces para compatibilidad con las distintas versiones del Browser.
-mkdir -p $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/
-mkdir -p $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/
-mkdir -p $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/
-cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts 
-cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/fonts 
-cp -a ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/fonts
-if [ $? -ne 0 ]
-then 
-	echo "$FUNCNAME(): Linking Browser fonts : ERROR"
-	exit 1
-fi
+# Si no existe, copiar pci.ids.
+[ -f $OGCLIENTMOUNT/etc/pci.ids ] || cp -va ${SVNCLIENTSTRUCTURE}/lib/pci.ids $OGCLIENTMOUNT/etc
 
-#########################################################
-cp -a ${SVNCLIENTSTRUCTURE}/lib/pci.ids $OGCLIENTMOUNT/etc
-if [ $? -ne 0 ]
-then 
-	echo "$FUNCNAME(): Copying pci.ids : ERROR"
-	exit 1
-fi
-####### Browsser
+# Dependencias Qt para el Browser.
+mkdir -p $OGCLIENTMOUNT/usr/local/{etc,lib,plugins}
+cp -av ${SVNCLIENTSTRUCTURE}/lib/qtlib/* $OGCLIENTMOUNT/usr/local/lib
+cp -av ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/lib
+cp -av ${SVNCLIENTSTRUCTURE}/lib/qtplugins/* $OGCLIENTMOUNT/usr/local/plugins
+cp -av ${SVNCLIENTSTRUCTURE}/etc/*.qmap $OGCLIENTMOUNT/usr/local/etc
+
+# Browser.
 cp -av ${SVNCLIENTSTRUCTURE}/bin/browser $OGCLIENTMOUNT/bin
-if [ $? -ne 0 ]
-then 
+if [ $? -ne 0 ]; then 
 	echo "$FUNCNAME(): Copying Browser : ERROR"
 	exit 1
 fi
 
-
-#Compatiblidad con og2
-cp -av ${SVNCLIENTSTRUCTURE}/bin/browser2 $OGCLIENTMOUNT/bin
-cp -av ${SVNOG2}/ogr/ogr $OGCLIENTMOUNT/opt/opengnsys/bin/
-cp -av ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/usr/lib/python2.7/libogr.py
-cp -av ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/usr/lib/python2.6/libogr.py
-cp -av ${SVNOG2}/ogr/libogr.py $OGCLIENTMOUNT/opt/opengnsys/lib/python
-
-echo "mkdir -p /opt/opengnsys/lib/engine/"
-mkdir -p /opt/opengnsys/engine/
-echo "cp -prv ${SVNOG2}/engine/2.0/* $OGCLIENTMOUNT/opt/opengnsys/engine/" 
-cp -av ${SVNOG2}/engine/2.0/* $OGCLIENTMOUNT/opt/opengnsys/engine/
-
-cp -av ${SVNOG2}/job_executer $OGCLIENTMOUNT/opt/opengnsys/bin/
-
-
-cp -av ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient  $OGCLIENTMOUNT/bin
+# ogAdmClient.
+cp -av ${SVNCLIENTSTRUCTURE}/bin/ogAdmClient $OGCLIENTMOUNT/bin
+if [ $? -ne 0 ]; then 
+	echo "$FUNCNAME(): Copying ogAdmClient: ERROR"
+	exit 1
+fi
 
 # El fichero de configuración debe sustituir a los 2 ficheros (borrar las 2 líneas).
 echo "${VERSIONBOOTTOOLS}-${OSCODENAME}-${OSRELEASE}-${VERSIONSVN}" > /$NAMEISOCLIENTFILE