Merge pull request #65 from mbien/quiet-zip
run zip and unzip quietly.
diff --git a/jobs/Jenkinsmatrixfile.groovy b/jobs/Jenkinsmatrixfile.groovy
index 3de043c..779dc8f 100644
--- a/jobs/Jenkinsmatrixfile.groovy
+++ b/jobs/Jenkinsmatrixfile.groovy
@@ -69,8 +69,8 @@
withAnt(jdk:"${env.JDK}") {
unstash 'testbuildzip'
unstash 'idebuildzip'
- unzip zipFile: 'nbbuild/build/testdist.zip', dir:'testdir'
- unzip zipFile: 'zip/NetBeansIDE.zip', dir:'netbeans'
+ unzip zipFile: 'nbbuild/build/testdist.zip', dir:'testdir', quiet: true
+ unzip zipFile: 'zip/NetBeansIDE.zip', dir:'netbeans', quiet: true
sh "mkdir -p ${WORKSPACE}/result/unit/${env.JDK}/${env.CLUSTER} "
sh 'java -version'
//sh 'ant -version'
diff --git a/resources/org/apache/netbeans/installer.sh b/resources/org/apache/netbeans/installer.sh
index ad4a919..92a02d4 100644
--- a/resources/org/apache/netbeans/installer.sh
+++ b/resources/org/apache/netbeans/installer.sh
@@ -50,7 +50,7 @@
#create cluster zip files
rm -rf temp
-unzip $1 -d temp
+unzip -q $1 -d temp
cd temp
mkdir javase
mkdir javase/netbeans
@@ -88,33 +88,33 @@
cd ..
echo `pwd`
echo $BINARY_NAME
-zip -r $BINARY_NAME-base.zip netbeans
+zip -q -r $BINARY_NAME-base.zip netbeans
mv $BINARY_NAME-base.zip ..
echo `pwd`
cd javase
-zip -r $BINARY_NAME-java.zip netbeans
+zip -q -r $BINARY_NAME-java.zip netbeans
mv $BINARY_NAME-java.zip ../..
cd ..
cd javaee
-zip -r $BINARY_NAME-enterprise.zip netbeans
+zip -q -r $BINARY_NAME-enterprise.zip netbeans
mv $BINARY_NAME-enterprise.zip ../..
cd ..
cd php
-zip -r $BINARY_NAME-php.zip netbeans
+zip -q -r $BINARY_NAME-php.zip netbeans
mv $BINARY_NAME-php.zip ../..
cd ..
cd webcommon
-zip -r $BINARY_NAME-webcommon.zip netbeans
+zip -q -r $BINARY_NAME-webcommon.zip netbeans
mv $BINARY_NAME-webcommon.zip ../..
cd ..
cd extide
-zip -r $BINARY_NAME-websvccommon.zip netbeans
+zip -q -r $BINARY_NAME-websvccommon.zip netbeans
mv $BINARY_NAME-websvccommon.zip ../..
cd ../..
diff --git a/resources/org/apache/netbeans/installermac.sh b/resources/org/apache/netbeans/installermac.sh
index 6f4d45f..bf350f0 100644
--- a/resources/org/apache/netbeans/installermac.sh
+++ b/resources/org/apache/netbeans/installermac.sh
@@ -49,7 +49,7 @@
#create cluster zip files
rm -rf temp
-unzip $1 -d temp
+unzip -q $1 -d temp
cd temp
mkdir javase
mkdir javase/netbeans
@@ -87,33 +87,33 @@
cd ..
echo `pwd`
echo $BINARY_NAME
-zip -r $BINARY_NAME-base.zip netbeans
+zip -q -r $BINARY_NAME-base.zip netbeans
mv $BINARY_NAME-base.zip ..
echo `pwd`
cd javase
-zip -r $BINARY_NAME-java.zip netbeans
+zip -q -r $BINARY_NAME-java.zip netbeans
mv $BINARY_NAME-java.zip ../..
cd ..
cd javaee
-zip -r $BINARY_NAME-enterprise.zip netbeans
+zip -q -r $BINARY_NAME-enterprise.zip netbeans
mv $BINARY_NAME-enterprise.zip ../..
cd ..
cd php
-zip -r $BINARY_NAME-php.zip netbeans
+zip -q -r $BINARY_NAME-php.zip netbeans
mv $BINARY_NAME-php.zip ../..
cd ..
cd webcommon
-zip -r $BINARY_NAME-webcommon.zip netbeans
+zip -q -r $BINARY_NAME-webcommon.zip netbeans
mv $BINARY_NAME-webcommon.zip ../..
cd ..
cd extide
-zip -r $BINARY_NAME-websvccommon.zip netbeans
+zip -q -r $BINARY_NAME-websvccommon.zip netbeans
mv $BINARY_NAME-websvccommon.zip ../..
cd ../..
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 6f0848d..7d86d1b 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -286,7 +286,7 @@
for (String target in targets) {
stage("${target} for ${clustername}") {
// prepare a clean subfolder target - clustername prefixed
- sh "rm -rf ${target}-${clustername}-temp && mkdir ${target}-${clustername}-temp && unzip nbbuild/build/${clustername}*.zip -d ${target}-${clustername}-temp && cp .gitignore ${env.WORKSPACE}/${target}-${clustername}-temp"
+ sh "rm -rf ${target}-${clustername}-temp && mkdir ${target}-${clustername}-temp && unzip -q nbbuild/build/${clustername}*.zip -d ${target}-${clustername}-temp && cp .gitignore ${env.WORKSPACE}/${target}-${clustername}-temp"
def add = "";
//
if (target=="build" && env.BRANCH_NAME!="release90") {
