diff --git a/openbis_all/source/bash/build/branch.sh b/openbis_all/source/bash/build/branch.sh index c433d8f0eeba80940fdf08696913fb1be45b83cf..576581e2a327a4dff4e20b2da804148c84dee0e4 100755 --- a/openbis_all/source/bash/build/branch.sh +++ b/openbis_all/source/bash/build/branch.sh @@ -10,7 +10,7 @@ then fi # exit if branch already exists -branch_heads=`git ls-remote --heads git@sissource.ethz.ch:sis/openbis.git $1` +branch_heads=`git ls-remote --heads git@sissource.ethz.ch:sispub/openbis.git $1` if [ -n "$branch_heads" ]; then echo "Branch already exists!" exit 1 diff --git a/openbis_all/source/bash/build/build.sh b/openbis_all/source/bash/build/build.sh index 9744734ce2614d2cbd51c4712fa72e6dde7de258..769c63088399140ccb669cdf8d40c23777cd2f10 100755 --- a/openbis_all/source/bash/build/build.sh +++ b/openbis_all/source/bash/build/build.sh @@ -37,12 +37,12 @@ if [ $? -ne 0 ]; then echo "Tag does not exist!"; exit 1; fi # build cd openbis_standard_technologies -./gradlew :clientsAndApis -x test -./gradlew :generateJavadoc +./gradlew :clean :clientsAndApis -x test +./gradlew :clean :generateJavadoc cd ../installation -./gradlew :build -x test +./gradlew :clean :build -x test cd ../plasmid -./gradlew :build -x test +./gradlew :clean :build -x test cd ../.. diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py index ba912cf8d232b5daee7614c97f53b39b781b282c..28e199de7ec1a2058de164a844a54d93aac3ea2d 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/exports-api/exports-api.py @@ -595,7 +595,7 @@ def getFilePath(spaceCode, projCode, expCode, sampCode, dataCode): def addToZipFile(path, file, zos): fis = FileInputStream(file); - zipEntry = ZipEntry(path); + zipEntry = ZipEntry(path[1:]); # Making paths relative to make them compatible with Windows zip implementation zos.putNextEntry(zipEntry); bytes = jarray.zeros(1024, "b");