opengnsys
/
oglive-builder
2
1
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

#245 #573 #574: Boot-tools para nuevo cliente ogLive incluye Browser con soporte HTTPS y teclado internacional, pero no añade soporte para la rama discontinuada de OG2. 

git-svn-id: https://opengnsys.es/svn/branches/version1.0@3656 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/master
ramon 2013-03-04 13:35:31 +00:00
parent f803f6586b
commit fd1e09fb3c
1 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
includes/usr/bin/boot-tools/boottoolsFsOpengnsys.sh
View File

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