diff --git a/docs/.project b/docs/.project index 02acba8..047455f 100644 --- a/docs/.project +++ b/docs/.project @@ -1,6 +1,6 @@ - docs geosaúde + i3geosaude docs @@ -10,20 +10,8 @@ - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.wst.jsdt.core.jsNature diff --git a/docs/.settings/org.eclipse.wst.jsdt.ui.superType.container b/docs/.settings/org.eclipse.wst.jsdt.ui.superType.container index 3bd5d0a..49c8cd4 100755 --- a/docs/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ b/docs/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -1 +1 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file +org.eclipse.wst.jsdt.launching.JRE_CONTAINER \ No newline at end of file diff --git a/docs/.settings/org.eclipse.wst.jsdt.ui.superType.name b/docs/.settings/org.eclipse.wst.jsdt.ui.superType.name index 05bd71b..11006e2 100755 --- a/docs/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ b/docs/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -1 +1 @@ -Window \ No newline at end of file +Global \ No newline at end of file diff --git a/gisvm/bootstrap.sh b/gisvm/bootstrap.sh index cdb1504..580dadd 100755 --- a/gisvm/bootstrap.sh +++ b/gisvm/bootstrap.sh @@ -27,7 +27,7 @@ SCRIPT_DIR=/usr/local/share if [ -z "$USER_NAME" ] ; then - USER_NAME="i3geosaude" + USER_NAME="user" fi USER_HOME="/home/$USER_NAME" diff --git a/gisvm/build_chroot_release.sh b/gisvm/build_chroot_release.sh index c5cb872..82d709b 100755 --- a/gisvm/build_chroot_release.sh +++ b/gisvm/build_chroot_release.sh @@ -272,4 +272,4 @@ echo echo "===============================================================" echo "Finished building $ISO_NAME" echo "===============================================================" -cd "$I3" + diff --git a/gisvm/install_i3geo.sh b/gisvm/install_i3geo.sh index bc18031..5d921bb 100755 --- a/gisvm/install_i3geo.sh +++ b/gisvm/install_i3geo.sh @@ -22,6 +22,11 @@ # sudo rm -rf /var/www/ms_tmp # sudo rm -rf /tmp/ms_tmp +echo +echo "===============================================================" +echo "Instalando i3GeoSaude" +echo "===============================================================" + ./diskspace_probe.sh "`basename $0`" begin BUILD_DIR=`pwd` #### @@ -34,7 +39,7 @@ fi #Repository url echo "Baixando arquivos do svn http://svn.gvsig.org/svn/i3geo/subgrupos/i3geosaude para /var/www" -svn checkout "http://svn.gvsig.org/svn/i3geo/subgrupos/i3geosaude" /var/www +svn checkout http://svn.gvsig.org/svn/i3geo/subgrupos/i3geosaude /var/www #i3GEO dependencies @@ -57,14 +62,11 @@ chown -R www-data:www-data "$ROOT_DIR/ms_tmp" chmod -R 755 "$TMP_DIR/ms_tmp" chmod -R 755 "$ROOT_DIR/ms_tmp" -#Deploy i3geo -cd "$TMP_DIR" - #Change permissions cd /var/www -chown -R www-data i3geo/ -chgrp -R www-data i3geo/ -chmod -R 755 i3geo/ +chown -R www-data /var/www +chgrp -R www-data /var/www +chmod -R 777 /var/www #add R repository to have the latest version of R @@ -125,7 +127,7 @@ rm spatstat_1.30-0.tar.gz echo "Installing i3geo desktop icon" if [ ! -e "/usr/local/share/icons/i3geo1.png" ] ; then mkdir -p /usr/local/share/icons - cp /var/www/i3geo/imagens/i3geo1.png /usr/local/share/icons/ + cp /var/www/Imagens/novaMarcaLogo.png /usr/local/share/icons/ fi #Add Launch icon to desktop @@ -138,8 +140,8 @@ Encoding=UTF-8 Name=i3geo Comment=i3geo Categories=Application;Geography;Geoscience;Education; -Exec=firefox http://localhost/i3geo/ms_criamapa.php?idioma=en -Icon=/usr/local/share/icons/i3geo1.png +Exec=firefox http://localhost +Icon=/usr/local/share/icons/novaMarcaLogo.png Terminal=false StartupNotify=false EOF @@ -151,9 +153,18 @@ USER_DESKTOP="$USER_HOME/Desktop/" # Add desktop icon if [ -d "$USER_DESKTOP" ] ; then echo "Copying icon to desktop at $USER_DESKTOP" - cp /usr/local/share/applications/i3geo.desktop "$USER_DESKTOP/i3geo.desktop" - chown $USER_NAME:$USER_NAME "$USER_DESKTOP/i3geo.desktop" - chmod +x "$USER_DESKTOP/i3geo.desktop" + #cp /usr/local/share/applications/i3geo.desktop "$USER_DESKTOP/i3geo.desktop" + cp /var/www/pastaHomeDistXubuntu/i3geosaude/atualiza.py /home/i3geosaude/atualiza.py + cp /var/www/pastaHomeDistXubuntu/i3geosaude/inicia.sh /home/i3geosaude/inicia.sh + cp /var/www/pastaHomeDistXubuntu/i3geosaude/proxy.db /home/i3geosaude/proxy.db + cp /var/www/pastaHomeDistXubuntu/i3geosaude/Area_de_Trabalho/* "$USER_DESKTOP" + mkdir /home/i3geosaude/backupi3Geosaude + cp /var/www/cron /var/spool/cron/crontabs/i3geosaude + + chown i3geosaude:i3geosaude /home/i3geosaude/* + chown i3geosaude:i3geosaude /home/i3geosaude/* + chmod +x /home/i3geosaude/atualiza.py + chmod +x /home/i3geosaude/inicia.sh fi # Fix path to natural_earth @@ -165,6 +176,11 @@ fi #sed -i -e 's/natural_earth/natural_earth2/' /var/www/i3geo/temas/geography_regions_polys.map #sed -i -e 's/natural_earth/natural_earth2/' /var/www/i3geo/temas/estadosl.map +echo +echo "===============================================================" +echo ls -l /var/www +echo "===============================================================" + #### "$BUILD_DIR"/diskspace_probe.sh "`basename $0`" end diff --git a/gisvm/makeIsoI3geoSaude_amd64.sh b/gisvm/makeIsoI3geoSaude_amd64.sh index 162355c..7b333aa 100755 --- a/gisvm/makeIsoI3geoSaude_amd64.sh +++ b/gisvm/makeIsoI3geoSaude_amd64.sh @@ -5,12 +5,10 @@ #prepara deluser --remove-home user -deluser --remove-home i3geosaude +#deluser --remove-home i3geosaude adduser user --disabled-password --gecos user -adduser i3geosaude --disabled-password --gecos i3geosaude - -cp cron /var/spool/cron/crontabs/i3geosaude +#adduser i3geosaude --disabled-password --gecos i3geosaude I3="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -21,6 +19,7 @@ echo "$I3" rm -Rf /root/livecdtmp chmod 777 bootstrap.sh ./bootstrap.sh +echo "caminho atual" cd "$I3" rm /usr/local/share/gisvm/bin/inchroot_release.sh @@ -39,8 +38,24 @@ rm /usr/local/share/gisvm/bin/install_icons_and_menus.sh cp install_icons_and_menus.sh /usr/local/share/gisvm/bin chmod 777 /usr/local/share/gisvm/bin/install_icons_and_menus.sh +rm /usr/local/share/gisvm/app-conf/build_chroot/27osgeo_groups +cp 27osgeo_groups /usr/local/share/gisvm/app-conf/build_chroot + # Build ISO chmod 777 build_chroot_release.sh ./build_chroot_release.sh amd64 +deluser --remove-home user +deluser --remove-home i3geosaude + +cd "$I3" +rm -Rf /var/livecd +mv ~/livecdtmp /var/livecd + +echo +echo "===============================================================" +echo "terminou $ISO_NAME" +echo "/var/livecd" +echo "===============================================================" +exit diff --git a/i3geo/admin/php/metaestat_templates.php b/i3geo/admin/php/metaestat_templates.php index 02984d8..bb8f39d 100644 --- a/i3geo/admin/php/metaestat_templates.php +++ b/i3geo/admin/php/metaestat_templates.php @@ -29,10 +29,13 @@ body {

Lista de templates para uso em aplicações do sistema de metadados estatísticos

Nome do template: $arq

"; $nomeimg = $locaplic.$metaestatTemplates."/".$nome.".png"; -- libgit2 0.21.2