diff options
author | Sven Gothel <[email protected]> | 2012-04-30 05:44:30 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-04-30 05:44:30 +0200 |
commit | 63a0b9f58a944d059b79eab29f60f8f686aac683 (patch) | |
tree | cea4378ca880c024cf946e3429d0062227ea729c /jenkins-builds/funcs_promotion.sh | |
parent | 9003b93385a2778e1d2e1cb96f8619ef7f6993e3 (diff) |
Fix regression of commit ca6ddbc606d2967a4deb23a7fb8e3d41f64f4a05 and b06b44ffb5652f9fca872b88c8c5b7b8a4dbd6fb: Apply 'find' for jar folder only w/ depth 1
Diffstat (limited to 'jenkins-builds/funcs_promotion.sh')
-rwxr-xr-x | jenkins-builds/funcs_promotion.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index 69edf87..48d4f8d 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -155,7 +155,7 @@ function prom_merge_modules() { else if [ -e jar ] ; then mkdir -p ../$mergefolder/jar - for l in `find jar -name \*natives\* -o -name \*.apk` ; do + for l in `find jar -maxdepth 1 -name \*natives\* -o -name \*.apk` ; do cp -av $l ../$mergefolder/jar/ done if [ -e jar/atomic ] ; then @@ -230,7 +230,7 @@ function prom_promote_module() { # 7z folder verfified above already local zfile=archive/jogamp-$i/$module-$i.7z local zfolder=tmp/`basename $zfile .7z` - for j in `find $zfolder/jar -name \*.jar -o -name \*.apk` ; do + for j in `find $zfolder/jar -maxdepth 1 -name \*.jar -o -name \*.apk` ; do cp -av $j ./jar/ done if [ -e $zfolder/jar/atomic ] ; then |