diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh index 6f517eda04..cdf41047fa 100755 --- a/Installation/Jenkins/build.sh +++ b/Installation/Jenkins/build.sh @@ -621,16 +621,26 @@ if test "${DOWNLOAD_STARTER}" == 1; then STARTER_REV=`curl -s https://api.github.com/repos/arangodb-helper/ArangoDBStarter/releases |grep tag_name |head -n 1 |${SED} -e "s;.*: ;;" -e 's;";;g' -e 's;,;;'` STARTER_URL=`curl -s https://api.github.com/repos/arangodb-helper/ArangoDBStarter/releases/tags/${STARTER_REV} |grep browser_download_url |grep "${OSNAME}" |${SED} -e "s;.*: ;;" -e 's;";;g' -e 's;,;;'` if test -n "${STARTER_URL}"; then - curl -LO "${STARTER_URL}" - FN=`echo ${STARTER_URL} |${SED} "s;.*/;;"` - if test "${isCygwin}" == 1; then - TN=arangodb.exe - else - TN=arangodb - fi - mkdir -p ${BUILD_DIR} - mv ${FN} ${BUILD_DIR}/${TN} - chmod a+x ${BUILD_DIR}/${TN} + export BUILD_DIR + export STARTER_URL + export SED + export FN + ( + mkdir -p ${BUILD_DIR} + cd ${BUILD_DIR} + if test "${isCygwin}" == 1; then + TN=arangodb.exe + else + TN=arangodb + fi + if test -f ${TN}; then + rm -f ${TN} + fi + curl -LO "${STARTER_URL}" + FN=`echo ${STARTER_URL} |${SED} "s;.*/;;"` + mv ${FN} ${TN} + chmod a+x ${TN} + ) fi CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DTHIRDPARTY_BIN=${BUILD_DIR}/${TN} " fi diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake index c3bd1e37ed..7a812440e2 100644 --- a/cmake/ArangoDBInstall.cmake +++ b/cmake/ArangoDBInstall.cmake @@ -233,10 +233,12 @@ endif() if (THIRDPARTY_SBIN) install(FILES ${THIRDPARTY_SBIN} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION "${CMAKE_INSTALL_SBINDIR}") endif() if (THIRDPARTY_BIN) install(FILES ${THIRDPARTY_BIN} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION "${CMAKE_INSTALL_BINDIR}") endif() diff --git a/scripts/build-bundle.sh b/scripts/build-bundle.sh index cb64d2794b..a6eb1fbb28 100755 --- a/scripts/build-bundle.sh +++ b/scripts/build-bundle.sh @@ -20,6 +20,7 @@ done --buildDir build-${EP}bundle \ --prefix "/opt/arangodb" \ --targetDir /var/tmp/ \ + --downloadStarter \ --clang \ --staticOpenSSL \ $@ diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh index fda247f74b..2886c81c2f 100755 --- a/scripts/build-deb.sh +++ b/scripts/build-deb.sh @@ -25,6 +25,7 @@ done --buildDir build-${EP}deb \ --targetDir /var/tmp/ \ --jemalloc \ + --downloadStarter \ --noopt \ $@ diff --git a/scripts/build-nsis.sh b/scripts/build-nsis.sh index f4c6c1e8b9..92c9248269 100644 --- a/scripts/build-nsis.sh +++ b/scripts/build-nsis.sh @@ -18,6 +18,7 @@ done --buildDir /cygdrive/c/b/${EP}/ \ --package NSIS \ --targetDir /var/tmp/ \ + --downloadStarter \ $@ cd ${DIR}/.. diff --git a/scripts/build-rpm.sh b/scripts/build-rpm.sh index a7aa4706e2..c65d57300e 100755 --- a/scripts/build-rpm.sh +++ b/scripts/build-rpm.sh @@ -20,6 +20,7 @@ done --buildDir build-${EP}rpm \ --targetDir /var/tmp/ \ --jemalloc \ + --downloadStarter \ --noopt \ $@ diff --git a/scripts/build-snap.sh b/scripts/build-snap.sh index ee048209a3..0ab8f1de49 100755 --- a/scripts/build-snap.sh +++ b/scripts/build-snap.sh @@ -29,6 +29,7 @@ cd ${DIR}/.. --snap \ --buildDir build-${EP}snap \ --targetDir /var/tmp/ \ + --downloadStarter \ --noopt \ $@