Revision 15281

View differences:

import/ext3D/trunk/install-extension3d/distribucion.sh
26 26
ANDAMI_PATH=`pwd`
27 27
cd -
28 28

  
29
cd ../install
29
#cd ../install
30 30
INSTALL_GVSIG_PATH=`pwd`
31 31
INSTALL_GVSIG_LINUX_PATH="$INSTALL_GVSIG_PATH"/instalador-gvSIG-lin
32 32
INSTALL_GVSIG_WINDOWS_PATH="$INSTALL_GVSIG_PATH"/instalador-gvSIG-win
......
103 103
#cp resources/andami-config.xml bin
104 104

  
105 105
#Copiamos el lanzador y sus tracuciones al tmpResources
106
rm -Rf tmpResources
106
rm -rf tmpResources
107 107
mkdir tmpResources
108
cp -R $INSTALL_GVSIG_PATH/launcher/izpack-launcher-1.3/dist/* ./tmpResources
108
cp -r $INSTALL_GVSIG_PATH/launcher/izpack-launcher-1.3/dist/* ./tmpResources
109 109
mv ./tmpResources/launcher-Win32.exe ./tmpResources/gvSIG.exe
110 110
#Quitamos el ini, manifest y los CVS
111
rm ./tmpResources/*.ini ./tmpResources/*.manifest
111
rm -rf ./tmpResources/*.ini ./tmpResources/*.manifest
112 112
find ./tmpResources -name CVS -type d -exec rm -rf {} 2> /dev/null ';' || true
113 113
echo OK.
114 114

  
......
173 173
echo "- Linux"
174 174
## Nueva instalacion para linux
175 175
cd "$DIR_BASE"/"$DIR_LIN"
176
rm -Rf "$INSTALLER_DIR"
176
rm -rf "$INSTALLER_DIR"
177 177
mkdir -p "$INSTALLER_DIR"/_tmp_install
178 178
cp "$JARNAME" "$INSTALLER_DIR"/_tmp_install
179 179
cd "$INSTALLER_DIR"
180 180
cp -R "$INSTALL_GVSIG_PATH"/launcher/izpack-launcher-1.3_linux/dist/* ./_tmp_install
181 181
find . -name CVS -type d -exec rm -rf {} 2> /dev/null ';' || true
182 182

  
183
rm ./_tmp_install/launcher.ini
183
rm -f ./_tmp_install/launcher.ini
184 184
cp "$DIR_BASE"/"$DIR_LIN"/resources/launcher.ini ./_tmp_install/launcher.ini
185 185
sed "s/%JARNAME%/$JARNAME/" ./_tmp_install/launcher.ini > ./_tmp_install/launcher.ini.bak
186 186
mv ./_tmp_install/launcher.ini.bak ./_tmp_install/launcher.ini
......
194 194
echo "lcount=$lcount" >> xx.tmp
195 195
cat xx.tmp "$DIR_BASE"/"$DIR_LIN"/resources/h_gvSIG-install.sh ./tmp.tgz  > "$LINUXBIN"
196 196
#cat xx.tmp "$DIR_BASE"/"$DIR_LIN"/resources/h_gvSIG-install.sh ./tmp_wjre.tgz  > "$LINUXBINWITHJRE"
197
rm xx.tmp
197
rm -f xx.tmp
198 198
chmod a+x "$LINUXBIN" #"$LINUXBINWITHJRE"
199 199
#mv "$LINUXBINWITHJRE" "$LINUXBIN" "$OUTPUT_DIR"
200 200
mv "$LINUXBIN" "$OUTPUT_DIR"
201 201
cd "$DIR_BASE"/"$DIR_LIN"
202
rm -Rf "$INSTALLER_DIR"
202
rm -rf "$INSTALLER_DIR"
203 203
## Fin Nueva instalacion para linux
204
rm "$JARNAME"
204
rm -f "$JARNAME"
205 205

  
206 206

  
207 207

  
......
210 210
echo "- Windows"
211 211
#set -x
212 212
cd "$DIR_BASE"/"$DIR_WIN"
213
rm -Rf "$INSTALLER_DIR"
213
rm -rf "$INSTALLER_DIR"
214 214
mkdir "$INSTALLER_DIR"
215 215
#cp -a installer_files "$INSTALLER_DIR"
216 216

  
......
247 247
rm dist_config.txt
248 248
rm "$WINDOWSZIP"
249 249

  
250
rm -Rf "$INSTALLER_DIR"
250
rm -rf "$INSTALLER_DIR"
251 251

  
252 252
mv "$WINDOWSEXE" "$OUTPUT_DIR"
253 253
#mv "$WINDOWSEXEWITHJRE" "$OUTPUT_DIR"
254 254

  
255 255
# Limpiamos tmpResources
256 256
cd "$DIR_BASE"/"$DIR_WIN"
257
rm -r ./tmpResources
257
rm -rf ./tmpResources
258 258
cd -
259 259

  
260 260
cd "$DIR_BASE"
import/ext3D/trunk/install-extension3d/windows/install.xml
105 105
      <!--file targetdir="$INSTALL_PATH/bin/lib/" src="../../_fwAndami/lib/beans.jar" override="true"/-->
106 106
      
107 107
      <!-- Copiando la cache -->
108
      <file  targetdir="$USER_HOME/gvSIG/.data/" src="/home/rgaitan/Desktop/cache" override="true"/-->
108
      <file  targetdir="$USER_HOME/gvSIG/.data/" src="/home/rgaitan/Desktop/cache" override="true"/>
109 109

  
110 110
	<!-- Sobreescribiendo el nuevo .ini -->
111 111
	<file os="windows" targetdir="$INSTALL_PATH/bin" src="resources/gvSIG.ini" override="true"/>	
import/ext3D/trunk/install-extension3d/linux/install.xml
100 100
      <!--file targetdir="$INSTALL_PATH/bin/lib/" src="../../_fwAndami/lib/beans.jar" override="true"/-->
101 101
      
102 102
      <!-- Copiando la cache -->
103
      <file  targetdir="$USER_HOME/gvSIG/.data/" src="/home/julio/Desktop/cache" override="true"/>
103
      <file  targetdir="$USER_HOME/gvSIG/.data/" src="/home/rgaitan/Desktop/cache" override="true"/>
104 104

  
105 105
	<!-- Sobreescribiendo el sh -->
106 106
	<file targetdir="$INSTALL_PATH/bin/" src="resources/gvSIG.sh" override="true"/>	
import/ext3D/trunk/install-extension3d/linux/resources/h_gvSIG-install.sh
51 51
fi
52 52

  
53 53
cd ..
54
rm -r ./_tmp_install 2>&1 >/dev/null
54
rm -rf ./_tmp_install 2>&1 >/dev/null
55 55
exit 0 

Also available in: Unified diff