fixed some parameter sorting in unzip command

bootstrap.sh

@@ -666,7 +666,7 @@ if $INSTALL_JAVA; then
 
 	echo "  - installing strong cryptographie"
 	fn_download_newer $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE $CACHE_DIR_REMOTE/$JAVA_CRYPTO_FILE
-	unzip -j -u $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE -d $DEPLOY_DIR/jre/lib/security >> setup_java.log 2>&1
+	unzip -j -u -d $DEPLOY_DIR/jre/lib/security $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE >> setup_java.log 2>&1
 fi
 
 if $INSTALL_TOMCAT; then
@@ -706,7 +706,7 @@ if $INSTALL_GEOSERVER; then
 
 	echo "Installing geoserver-shell $GEOSERVER_SHELL_VERSION"
 	fn_download_newer $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE $CACHE_DIR_REMOTE/$GEOSERVER_SHELL_FILE
-	unzip $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE -d $DEPLOY_DIR >> install_geoserver_shell.log 2>&1
+	unzip -o -d $DEPLOY_DIR $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE >> install_geoserver_shell.log 2>&1
 	ln -sf $DEPLOY_DIR/gs-shell-0.2-SNAPSHOT $DEPLOY_DIR/gs-shell
 	make >> install_geoserver_shell.log 2>&1
 	make install >> install_geoserver_shell.log 2>&1
@@ -752,7 +752,7 @@ if $INSTALL_PROJECT_PSIPROBE; then
 	echo "  - artifact: $TEMPLATE_PSIPROBE_DOWNLOAD_URL"
 
 	fn_download_newer $DOWNLOAD_DIR/$TEMPLATE_PSIPROBE_FILE "$TEMPLATE_PSIPROBE_DOWNLOAD_URL"
-	unzip $DOWNLOAD_DIR/$TEMPLATE_PSIPROBE_FILE probe.war -d $TOMCAT_WEBAPP_DIR
+	unzip -o -d $TOMCAT_WEBAPP_DIR $DOWNLOAD_DIR/$TEMPLATE_PSIPROBE_FILE probe.war
 	unzip -o -d $TOMCAT_WEBAPP_DIR/psiprobe $TOMCAT_WEBAPP_DIR/probe.war >> install_psiprobe.log 2>&1
 	rm -f $TOMCAT_WEBAPP_DIR/probe.war >> install_psiprobe.log 2>&1
 fi
@@ -761,7 +761,7 @@ if $INSTALL_MAVEN; then
 	echo "Installing maven $MAVEN_VERSION"
 	mkdir -p $CACHE_DIR_LOCAL/maven
 	fn_download_newer $DOWNLOAD_DIR/$MAVEN_FILE "$MAVEN_DOWNLOAD_URL"
-	unzip -o $DOWNLOAD_DIR/$MAVEN_FILE -d $DEPLOY_DIR >> install_maven.log 2>&1
+	unzip -o -d $DEPLOY_DIR $DOWNLOAD_DIR/$MAVEN_FILE>> install_maven.log 2>&1
 	ln -sf $DEPLOY_DIR/apache-maven-$MAVEN_VERSION $DEPLOY_DIR/apache-maven
 
 	echo "  - exporting maven options"
@@ -800,11 +800,11 @@ if $INSTALL_NEO4J_SPATIAL; then
 			# We need to compile the source when importing data, so that the main class gets compiled
 			echo "  - copying neo4j-spatial into geoserver (from source)"
 			mvn clean install -DskipTests >> $WORKING_DIR/install_neo4j_spatial.log 2>&1
-			unzip -o $DEPLOY_DIR/neo4j-spatial/target/*server-plugin.zip -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib >> $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+			unzip -o -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib $DEPLOY_DIR/neo4j-spatial/target/*server-plugin.zip >> $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
 		else
 			echo "  - copying neo4j-spatial into geoserver (from binary)"
 			fn_download_newer $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip "$NEO4J_SPATIAL_PLUGIN_DOWNLOAD_URL"
-			unzip -o $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib >> $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
+			unzip -o -d $TOMCAT_WEBAPP_DIR/geoserver/WEB-INF/lib $DOWNLOAD_DIR/neo4j-spatial-$NEO4J_SPATIAL_VERSION-server-plugin.zip >> $WORKING_DIR/install_neo4j_spatial_plugin.log 2>&1
 		fi
 	fi
 	cd $WORKING_DIR
@@ -814,7 +814,7 @@ if $IMPORT_DATA_OSM; then
 	echo "Installing osmosis $OSMOSIS_VERSION"
 	fn_download_newer $DOWNLOAD_DIR/$OSMOSIS_FILE "$OSMOSIS_DOWNLOAD_URL"
 	mkdir -p $DEPLOY_DIR/osmosis-$OSMOSIS_VERSION
-	unzip -o $DOWNLOAD_DIR/$OSMOSIS_FILE -d $DEPLOY_DIR/osmosis-$OSMOSIS_VERSION >> install_osmosis.log 2>&1
+	unzip -o -d $DEPLOY_DIR/osmosis-$OSMOSIS_VERSION $DOWNLOAD_DIR/$OSMOSIS_FILE >> install_osmosis.log 2>&1
 	ln -sf $DEPLOY_DIR/osmosis-* $DEPLOY_DIR/osmosis
 	chmod a+x $DEPLOY_DIR/osmosis/bin/osmosis
 fi