pleroma

commit: d501e55ec7fbb31d3baef548f9f773648c13896e
parent afc68a052c384adffc7040df9e1faeb2ffacf6e4
Author: rinpatch <rinpatch@sdf.org>
Date:   Sun, 20 Dec 2020 09:59:53 +0000

Merge branch 'bugfix/mastofe-install-script' into 'develop'

download-mastofe-build.sh: Proper exit when artifact is missing

Closes #2329

See merge request pleroma/pleroma!3191
Diffstat:
M
installation/download-mastofe-build.sh
21
++++++++++++---------

1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/installation/download-mastofe-build.sh b/installation/download-mastofe-build.sh
@@ -9,29 +9,32 @@ static_dir="instance/static"
 # project_branch="pleroma"
 # static_dir="priv/static"
 
-if [[ ! -d "${static_dir}" ]]
+if [ ! -d "${static_dir}" ]
 then
 	echo "Error: ${static_dir} directory is missing, are you sure you are running this script at the root of pleroma’s repository?"
 	exit 1
 fi
 
-last_modified="$(curl -s -I 'https://git.pleroma.social/api/v4/projects/'${project_id}'/jobs/artifacts/'${project_branch}'/download?job=build' | grep '^Last-Modified:' | cut -d: -f2-)"
+last_modified="$(curl --fail -s -I 'https://git.pleroma.social/api/v4/projects/'${project_id}'/jobs/artifacts/'${project_branch}'/download?job=build' | grep '^Last-Modified:' | cut -d: -f2-)"
 
 echo "branch:${project_branch}"
 echo "Last-Modified:${last_modified}"
 
 artifact="mastofe.zip"
 
-if [[ -e mastofe.timestamp ]] && [[ "${last_modified}" != "" ]]
+if [ "${last_modified}x" = "x" ]
 then
-	if [[ "$(cat mastofe.timestamp)" == "${last_modified}" ]]
-	then
-		echo "MastoFE is up-to-date, exiting…"
-		exit 0
-	fi
+	echo "ERROR: Couldn't get the modification date of the latest build archive, maybe it expired, exiting..."
+	exit 1
+fi
+
+if [ -e mastofe.timestamp ] && [ "$(cat mastofe.timestamp)" = "${last_modified}" ]
+then
+	echo "MastoFE is up-to-date, exiting..."
+	exit 0
 fi
 
-curl -c - "https://git.pleroma.social/api/v4/projects/${project_id}/jobs/artifacts/${project_branch}/download?job=build" -o "${artifact}" || exit
+curl --fail -c - "https://git.pleroma.social/api/v4/projects/${project_id}/jobs/artifacts/${project_branch}/download?job=build" -o "${artifact}" || exit
 
 # TODO: Update the emoji as well
 rm -fr "${static_dir}/sw.js" "${static_dir}/packs" || exit