Fix forgotten leftovers

Author: KVS85

jenkins/forTestDocker.fish

@@ -57,7 +57,7 @@ and findArangoDBVersion
 and buildStaticArangoDB
 and downloadStarter
 and downloadSyncer
-and copyRclone "linux"
+and downloadRclone
 and setArchSuffix
 and set -xg HUB_ENTERPRISE "arangodb/enterprise-test:$DOCKER_TAG_JENKINS$archSuffix"
 and buildDockerImage $HUB_ENTERPRISE

jenkins/forTestDockerEnterprise.fish

@@ -36,7 +36,7 @@ and findArangoDBVersion
 and buildStaticArangoDB
 and downloadStarter
 and downloadSyncer
-and copyRclone "linux"
+and downloadRclone
 and setArchSuffix
 and set -xg HUB_ENTERPRISE "arangodb/enterprise-test:$DOCKER_TAG_JENKINS$archSuffix"
 and buildDockerImage $HUB_ENTERPRISE

jenkins/nightlyUploadFiles.fish

@@ -19,7 +19,7 @@ function createIndex
   and mkdir root-dir
   and echo "create new links..."
   and cp -rs $SRC root-dir/
-  and find root-dir -name "*3e*" -exec rm -f "{}" ";"
+#  and find root-dir -name "*3e*" -exec rm -f "{}" ";"
   and find root-dir -name "index.html" -exec rm -f "{}" ";"
   and echo "creating index.html..."
   and sed -e 's/os\.walk(root)/os\.walk(root,followlinks=True)/' program.py > program2.py

scripts/downloadRclone.fish

@@ -51,9 +51,11 @@ echo "Using RCLONE $RCLONE_RELEASE"
 
 mkdir -p $RCLONE_FOLDER
 set -l RCLONE_PATH $RCLONE_FOLDER/rclone-arangodb
-echo "https://$ARANGODB_GIT_HOST/$HELPER_GIT_ORGA/rclone-arangodb/releases/download/$RCLONE_REV/"$RCLONE_RELEASE"_rclone-arangodb-$PLATFORM-$arch"
-and curl -s -L -o "$RCLONE_PATH" "https://$ARANGODB_GIT_HOST/$HELPER_GIT_ORGA/rclone-arangodb/releases/download/$RCLONE_REV/"$RCLONE_RELEASE"_rclone-arangodb-$PLATFORM-$arch"
+echo "https://$ARANGODB_GIT_HOST/$ARANGODB_GIT_ORGA/rclone-arangodb/releases/download/$RCLONE_REV/"$RCLONE_RELEASE"_rclone-arangodb-$PLATFORM-$arch"
+and curl -s -L -o "$RCLONE_PATH" "https://$ARANGODB_GIT_HOST/$ARANGODB_GIT_ORGA/rclone-arangodb/releases/download/$RCLONE_REV/"$RCLONE_RELEASE"_rclone-arangodb-$PLATFORM-$arch"
+and apk add file
+and eval "file -bL --mime $RCLONE_PATH | grep -v -q '^text'"
 and chmod 755 "$RCLONE_PATH"
-and echo Rclone ready for build $RCLONE_PATH
+and echo "Rclone ready for build $RCLONE_PATH"
 and setupSourceInfo "$RCLONE_RELEASE"
 or begin echo "ERROR - cannot download Rclone"; setupSourceInfo "N/A"; exit 1; end