From 88ef74aebcb98f326cffe0bc0052f77123adc0a1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 9 May 2023 00:42:24 +0200 Subject: jenkins-builds/funcs_promotion.sh: Fix *-java-src.zip handling (residing in subfolder jar) --- jenkins-builds/funcs_promotion.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index 1faba97..589b10e 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -367,9 +367,9 @@ function prom_make_fatjar() { mkdir tmp/fatjarsrc cd tmp/fatjarsrc - fat_java_src_modules="gluegen jar/joal jar/jogl jar/jocl" + fat_java_src_modules="gluegen joal jogl jocl" for i in $fat_java_src_modules ; do - unzip ../../tmp/$i-$masterpick/$i-java-src.zip + unzip ../../tmp/$i-$masterpick/jar/$i-java-src.zip rm -rf META-INF done zip -r ../../fat/jogamp-fat-java-src.zip . @@ -390,8 +390,8 @@ function prom_make_fatjar() { mkdir tmp/fattestjarsrc cd tmp/fattestjarsrc for i in $fat_java_src_modules ; do - if [ -e ../../tmp/$i-$masterpick/$i-test-java-src.zip ] ; then - unzip ../../tmp/$i-$masterpick/$i-test-java-src.zip + if [ -e ../../tmp/$i-$masterpick/jar/$i-test-java-src.zip ] ; then + unzip ../../tmp/$i-$masterpick/jar/$i-test-java-src.zip fi rm -rf META-INF done -- cgit v1.2.3