Skip to content
Snippets Groups Projects
Verified Commit 496f5a1a authored by Thomas Neidhart's avatar Thomas Neidhart
Browse files

Check for empty key file

parent 349239b8
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,12 @@ function download() {
rm -f ${TMP_FILE}
return 1
fi
if [ ! -s "${TMP_FILE}" ]; then
rm -f ${TMP_FILE}
return 1
fi
cp ${TMP_FILE} ${OUTPUT_FILE}
rm -f ${TMP_FILE}
return 0
......@@ -176,7 +182,6 @@ KEY_FILES=()
for USER in "${ECLIPSE_USERS[@]}"
do
print_verbose "Downloading keyfile for Eclipse user '${USER}'"
KEY_FILE=$(mktemp)
ECLIPSE_PROFILE=$(get_eclipse_profile "${USER}")
if [ -z "${ECLIPSE_PROFILE}" ]; then
......@@ -184,16 +189,20 @@ do
exit 1
fi
KEY_FILE=$(mktemp)
if ! download_public_key_from_gitlab "${USER}" "${KEY_FILE}"; then
print_verbose "Failed to download keys from Gitlab for user '${USER}', trying GitHub..."
GITHUB_USER=$(get_github_handle "${ECLIPSE_PROFILE}")
if [ -z ${GITHUB_USER} ]; then
rm -f "${KEY_FILE}"
print_error "Failed to get GitHub handle for Eclipse user '${USER}'"
exit 1
fi
if ! download_public_key_from_github "${GITHUB_USER}" "${KEY_FILE}"; then
rm -f "${KEY_FILE}"
print_error "Failed to download keys from GitHub for user '${GITHUB_USER}'"
exit 1
else
......@@ -213,7 +222,8 @@ do
KEY_FILE=$(mktemp)
if ! download_public_key_from_github "${USER}" "${KEY_FILE}"; then
print_verbose "Failed to download keys from GitHub for user '${USER}'"
rm -f "${KEY_FILE}"
print_error "Failed to download keys from GitHub for user '${USER}'"
exit 1
else
print_verbose "Downloaded keys from GitHub for user '${USER}'"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment