s3: ajoute un paramètre avec le dossier où sont situées les données

.gitlab-ci.yml

@@ -74,10 +74,10 @@ pep8:
   - unprivileged
   needs: [install]
   script:
-  - s3/download-from-s3.sh "${PREF}" "${S3_KEY}" "${S3_SECRET}" "${S3_HOST}" "${S3_BUCKET}" || true
+  - s3/download-from-s3.sh "${PREF}" "${S3_KEY}" "${S3_SECRET}" "${S3_HOST}" "${S3_BUCKET}" data/ || true
   - /etc/init.d/tor start
   - make "${PREF}"
-  - s3/upload-to-s3.sh "${PREF}" "${S3_KEY}" "${S3_SECRET}" "${S3_HOST}" "${S3_BUCKET}" || true
+  - s3/upload-to-s3.sh "${PREF}" "${S3_KEY}" "${S3_SECRET}" "${S3_HOST}" "${S3_BUCKET}" data/ || true
   cache:
     key: $CI_COMMIT_REF_SLUG
     paths:

s3/download-all-from-s3.sh

@@ -6,6 +6,7 @@ s3_key="${1}"
 s3_secret="${2}"
 s3_host="${3}"
 s3_bucket="${4}"
+dest="${5}"
 
 root_path=$(dirname $(realpath "${BASH_SOURCE[0]}"))
 
@@ -111,12 +112,12 @@ pref973
 pref974
 pref976"
 
-if test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket"; then
-	echo "Usage: ${0} <s3_key> <s3_secret> <s3_host> <s3_bucket>"
+if test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket" || test -z "$dest"; then
+	echo "Usage: ${0} <s3_key> <s3_secret> <s3_host> <s3_bucket> <dest>"
 	exit 1
 fi
 
 for i in $administrations; do
-	${root_path}/download-from-s3.sh "${i}" "$s3_key" "$s3_secret" "$s3_host" "$s3_bucket" || true
-	rm "${root_path}/../data/${i}.zip" || true
+	${root_path}/download-from-s3.sh "${i}" "$s3_key" "$s3_secret" "$s3_host" "$s3_bucket" "$dest" || true
+	rm "${dest}/${i}.zip" || true
 done

s3/download-from-s3.sh

@@ -7,14 +7,17 @@ s3_key="${2}"
 s3_secret="${3}"
 s3_host="${4}"
 s3_bucket="${5}"
+dest="${6}"
 
-if test -z "$pref" || test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket"; then
-	echo "Usage: ${0} <pref> <s3_key> <s3_secret> <s3_host> <s3_bucket>"
+if test -z "$pref" || test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket" || test -z "$dest"; then
+	echo "Usage: ${0} <pref> <s3_key> <s3_secret> <s3_host> <s3_bucket> <dest>"
 	exit 1
 fi
 
-mkdir -p "$(dirname $(realpath "${BASH_SOURCE[0]}"))/../data/"
-cd "$(dirname $(realpath "${BASH_SOURCE[0]}"))/../data/"
+dest=$(realpath "${dest}")
+
+mkdir -p "${dest}/"
+cd "${dest}/"
 
 file="${pref}.zip"
 

s3/upload-all-to-s3.sh

@@ -6,6 +6,7 @@ s3_key="${1}"
 s3_secret="${2}"
 s3_host="${3}"
 s3_bucket="${4}"
+data="${5}"
 
 root_path=$(dirname $(realpath "${BASH_SOURCE[0]}"))
 
@@ -111,11 +112,11 @@ pref973
 pref974
 pref976"
 
-if test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket"; then
-	echo "Usage: ${0} <s3_key> <s3_secret> <s3_host> <s3_bucket>"
+if test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket" || test -z "$data"; then
+	echo "Usage: ${0} <s3_key> <s3_secret> <s3_host> <s3_bucket> <data>"
 	exit 1
 fi
 
 for i in $administrations; do
-	${root_path}/upload-to-s3.sh "${i}" "$s3_key" "$s3_secret" "$s3_host" "$s3_bucket" || true
+	${root_path}/upload-to-s3.sh "${i}" "$s3_key" "$s3_secret" "$s3_host" "$s3_bucket" "$data" || true
 done

s3/upload-to-s3.sh

@@ -7,13 +7,16 @@ s3_key="${2}"
 s3_secret="${3}"
 s3_host="${4}"
 s3_bucket="${5}"
+data="${6}"
 
-if test -z "$pref" || test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket"; then
-	echo "Usage: ${0} <pref> <s3_key> <s3_secret> <s3_host> <s3_bucket>"
+if test -z "$pref" || test -z "$s3_key" || test -z "$s3_secret" || test -z "$s3_host" || test -z "$s3_bucket" || test -z "$data"; then
+	echo "Usage: ${0} <pref> <s3_key> <s3_secret> <s3_host> <s3_bucket> <data>"
 	exit 1
 fi
 
-cd "$(dirname $(realpath "${BASH_SOURCE[0]}"))/../data/${pref}/raa"
+data=$(realpath "${data}")
+
+cd "${data}/${pref}/raa"
 cd "../../"
 
 file="${pref}.zip"