Download as
Browse Code »

Commit d3f28755fd8d35ee3ed481108fe7f8fc96a73e40

Authored by Edmar Moretti
1 parent f7519dc4
Exists in master

--no commit message

Showing 8 changed files with 59 additions and 37 deletions   Show diff stats
docs/.project
  Diff comments   View file @d3f2875
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <projectDescription>
3   - <name>docs geosa&uacute;de</name>
  3 + <name>i3geosaude docs</name>
4 4 <comment></comment>
5 5 <projects>
6 6 </projects>
... ... @@ -10,20 +10,8 @@
10 10 <arguments>
11 11 </arguments>
12 12 </buildCommand>
13   - <buildCommand>
14   - <name>org.eclipse.wst.common.project.facet.core.builder</name>
15   - <arguments>
16   - </arguments>
17   - </buildCommand>
18   - <buildCommand>
19   - <name>org.eclipse.wst.validation.validationbuilder</name>
20   - <arguments>
21   - </arguments>
22   - </buildCommand>
23 13 </buildSpec>
24 14 <natures>
25   - <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
26   - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
27 15 <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
28 16 </natures>
29 17 </projectDescription>
... ...
docs/.settings/org.eclipse.wst.jsdt.ui.superType.container
  Diff comments   View file @d3f2875
1   -org.eclipse.wst.jsdt.launching.baseBrowserLibrary
2 1 \ No newline at end of file
  2 +org.eclipse.wst.jsdt.launching.JRE_CONTAINER
3 3 \ No newline at end of file
... ...
docs/.settings/org.eclipse.wst.jsdt.ui.superType.name
  Diff comments   View file @d3f2875
1   -Window
2 1 \ No newline at end of file
  2 +Global
3 3 \ No newline at end of file
... ...
gisvm/bootstrap.sh
  Diff comments   View file @d3f2875
... ... @@ -27,7 +27,7 @@
27 27 SCRIPT_DIR=/usr/local/share
28 28  
29 29 if [ -z "$USER_NAME" ] ; then
30   - USER_NAME="i3geosaude"
  30 + USER_NAME="user"
31 31 fi
32 32 USER_HOME="/home/$USER_NAME"
33 33  
... ...
gisvm/build_chroot_release.sh
  Diff comments   View file @d3f2875
... ... @@ -272,4 +272,4 @@ echo
272 272 echo "==============================================================="
273 273 echo "Finished building $ISO_NAME"
274 274 echo "==============================================================="
275   -cd "$I3"
  275 +
... ...
gisvm/install_i3geo.sh
  Diff comments   View file @d3f2875
... ... @@ -22,6 +22,11 @@
22 22 # sudo rm -rf /var/www/ms_tmp
23 23 # sudo rm -rf /tmp/ms_tmp
24 24  
  25 +echo
  26 +echo "==============================================================="
  27 +echo "Instalando i3GeoSaude"
  28 +echo "==============================================================="
  29 +
25 30 ./diskspace_probe.sh "`basename $0`" begin
26 31 BUILD_DIR=`pwd`
27 32 ####
... ... @@ -34,7 +39,7 @@ fi
34 39  
35 40 #Repository url
36 41 echo "Baixando arquivos do svn http://svn.gvsig.org/svn/i3geo/subgrupos/i3geosaude para /var/www"
37   -svn checkout "http://svn.gvsig.org/svn/i3geo/subgrupos/i3geosaude" /var/www
  42 +svn checkout http://svn.gvsig.org/svn/i3geo/subgrupos/i3geosaude /var/www
38 43  
39 44  
40 45 #i3GEO dependencies
... ... @@ -57,14 +62,11 @@ chown -R www-data:www-data &quot;$ROOT_DIR/ms_tmp&quot;
57 62 chmod -R 755 "$TMP_DIR/ms_tmp"
58 63 chmod -R 755 "$ROOT_DIR/ms_tmp"
59 64  
60   -#Deploy i3geo
61   -cd "$TMP_DIR"
62   -
63 65 #Change permissions
64 66 cd /var/www
65   -chown -R www-data i3geo/
66   -chgrp -R www-data i3geo/
67   -chmod -R 755 i3geo/
  67 +chown -R www-data /var/www
  68 +chgrp -R www-data /var/www
  69 +chmod -R 777 /var/www
68 70  
69 71  
70 72 #add R repository to have the latest version of R
... ... @@ -125,7 +127,7 @@ rm spatstat_1.30-0.tar.gz
125 127 echo "Installing i3geo desktop icon"
126 128 if [ ! -e "/usr/local/share/icons/i3geo1.png" ] ; then
127 129 mkdir -p /usr/local/share/icons
128   - cp /var/www/i3geo/imagens/i3geo1.png /usr/local/share/icons/
  130 + cp /var/www/Imagens/novaMarcaLogo.png /usr/local/share/icons/
129 131 fi
130 132  
131 133 #Add Launch icon to desktop
... ... @@ -138,8 +140,8 @@ Encoding=UTF-8
138 140 Name=i3geo
139 141 Comment=i3geo
140 142 Categories=Application;Geography;Geoscience;Education;
141   -Exec=firefox http://localhost/i3geo/ms_criamapa.php?idioma=en
142   -Icon=/usr/local/share/icons/i3geo1.png
  143 +Exec=firefox http://localhost
  144 +Icon=/usr/local/share/icons/novaMarcaLogo.png
143 145 Terminal=false
144 146 StartupNotify=false
145 147 EOF
... ... @@ -151,9 +153,18 @@ USER_DESKTOP=&quot;$USER_HOME/Desktop/&quot;
151 153 # Add desktop icon
152 154 if [ -d "$USER_DESKTOP" ] ; then
153 155 echo "Copying icon to desktop at $USER_DESKTOP"
154   - cp /usr/local/share/applications/i3geo.desktop "$USER_DESKTOP/i3geo.desktop"
155   - chown $USER_NAME:$USER_NAME "$USER_DESKTOP/i3geo.desktop"
156   - chmod +x "$USER_DESKTOP/i3geo.desktop"
  156 + #cp /usr/local/share/applications/i3geo.desktop "$USER_DESKTOP/i3geo.desktop"
  157 + cp /var/www/pastaHomeDistXubuntu/i3geosaude/atualiza.py /home/i3geosaude/atualiza.py
  158 + cp /var/www/pastaHomeDistXubuntu/i3geosaude/inicia.sh /home/i3geosaude/inicia.sh
  159 + cp /var/www/pastaHomeDistXubuntu/i3geosaude/proxy.db /home/i3geosaude/proxy.db
  160 + cp /var/www/pastaHomeDistXubuntu/i3geosaude/Area_de_Trabalho/* "$USER_DESKTOP"
  161 + mkdir /home/i3geosaude/backupi3Geosaude
  162 + cp /var/www/cron /var/spool/cron/crontabs/i3geosaude
  163 +
  164 + chown i3geosaude:i3geosaude /home/i3geosaude/*
  165 + chown i3geosaude:i3geosaude /home/i3geosaude/*
  166 + chmod +x /home/i3geosaude/atualiza.py
  167 + chmod +x /home/i3geosaude/inicia.sh
157 168 fi
158 169  
159 170 # Fix path to natural_earth
... ... @@ -165,6 +176,11 @@ fi
165 176 #sed -i -e 's/natural_earth/natural_earth2/' /var/www/i3geo/temas/geography_regions_polys.map
166 177 #sed -i -e 's/natural_earth/natural_earth2/' /var/www/i3geo/temas/estadosl.map
167 178  
  179 +echo
  180 +echo "==============================================================="
  181 +echo ls -l /var/www
  182 +echo "==============================================================="
  183 +
168 184  
169 185 ####
170 186 "$BUILD_DIR"/diskspace_probe.sh "`basename $0`" end
... ...
gisvm/makeIsoI3geoSaude_amd64.sh
  Diff comments   View file @d3f2875
... ... @@ -5,12 +5,10 @@
5 5  
6 6 #prepara
7 7 deluser --remove-home user
8   -deluser --remove-home i3geosaude
  8 +#deluser --remove-home i3geosaude
9 9  
10 10 adduser user --disabled-password --gecos user
11   -adduser i3geosaude --disabled-password --gecos i3geosaude
12   -
13   -cp cron /var/spool/cron/crontabs/i3geosaude
  11 +#adduser i3geosaude --disabled-password --gecos i3geosaude
14 12  
15 13 I3="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
16 14  
... ... @@ -21,6 +19,7 @@ echo &quot;$I3&quot;
21 19 rm -Rf /root/livecdtmp
22 20 chmod 777 bootstrap.sh
23 21 ./bootstrap.sh
  22 +echo "caminho atual"
24 23 cd "$I3"
25 24  
26 25 rm /usr/local/share/gisvm/bin/inchroot_release.sh
... ... @@ -39,8 +38,24 @@ rm /usr/local/share/gisvm/bin/install_icons_and_menus.sh
39 38 cp install_icons_and_menus.sh /usr/local/share/gisvm/bin
40 39 chmod 777 /usr/local/share/gisvm/bin/install_icons_and_menus.sh
41 40  
  41 +rm /usr/local/share/gisvm/app-conf/build_chroot/27osgeo_groups
  42 +cp 27osgeo_groups /usr/local/share/gisvm/app-conf/build_chroot
  43 +
42 44 # Build ISO
43 45 chmod 777 build_chroot_release.sh
44 46 ./build_chroot_release.sh amd64
45 47  
  48 +deluser --remove-home user
  49 +deluser --remove-home i3geosaude
  50 +
  51 +cd "$I3"
  52 +rm -Rf /var/livecd
  53 +mv ~/livecdtmp /var/livecd
  54 +
  55 +echo
  56 +echo "==============================================================="
  57 +echo "terminou $ISO_NAME"
  58 +echo "/var/livecd"
  59 +echo "==============================================================="
  60 +exit
46 61  
... ...
i3geo/admin/php/metaestat_templates.php
  Diff comments   View file @d3f2875
... ... @@ -29,10 +29,13 @@ body {
29 29 <div id=cabecalhoPrincipal></div>
30 30 <h1>Lista de templates para uso em aplica&ccedil;&otilde;es do sistema de metadados estat&iacute;sticos</h1>
31 31 <?php
32   - $arqs = listaArquivos($locaplic.$metaestatTemplates)["arquivos"];
  32 + $arqs = listaArquivos($locaplic.$metaestatTemplates);
  33 + $arqs = $arqs["arquivos"];
33 34 foreach($arqs as $arq){
34   - $nome = explode(".",$arq)[0];
35   - $ext = explode(".",$arq)[1];
  35 + $nome = explode(".",$arq);
  36 + $nome = $nome[0];
  37 + $ext = explode(".",$arq);
  38 + $ext = $ext[1];
36 39 if($ext == "php"){
37 40 echo "<p>Nome do template: <i>$arq</i></p>";
38 41 $nomeimg = $locaplic.$metaestatTemplates."/".$nome.".png";
... ...