Create user: skip zip creation run if there are no PEM files

Avoid "file not found" zip file creation and remove if there are no
PEM files created, eg if we have a pre defined pub file
This commit is contained in:
Clemens Schwaighofer
2024-09-04 13:21:36 +09:00
parent 5bf30a8b2f
commit 0bd40cdd73

View File

@@ -421,34 +421,37 @@ done;
if [ ${INFO} -eq 1 ]; then if [ ${INFO} -eq 1 ]; then
exit; exit;
fi; fi;
# zip everything and remove data in ssh key folder, delete output file with passwords # check if there are any files in the SSH_KEYGEN_FOLDER, else skip zip file creation and file move
if [ ${TEST} -eq 0 ]; then if (shopt -s nullglob dotglob; f=("${SSH_KEYGEN_FOLDER}"*".pem"*); ((${#f[@]}))); then
# zip everything and remove data in ssh key folder, delete output file with passwords
if [ ${TEST} -eq 0 ]; then
zip -r \ zip -r \
"${ROOT_FOLDER}${output_zip_folder}${output_zip}" \ "${ROOT_FOLDER}${output_zip_folder}${output_zip}" \
"${input_file}" \ "${input_file}" \
"${output_file}" \ "${output_file}" \
"${SSH_KEYGEN_FOLDER}" \ "${SSH_KEYGEN_FOLDER}" \
-x\*.gitignore; -x\*.gitignore;
else else
echo "zip -r \\" echo "zip -r \\"
echo "${ROOT_FOLDER}${output_zip_folder}${output_zip} \\" echo "${ROOT_FOLDER}${output_zip_folder}${output_zip} \\"
echo "${input_file} \\" echo "${input_file} \\"
echo "${output_file} \\" echo "${output_file} \\"
echo "${SSH_KEYGEN_FOLDER} \\" echo "${SSH_KEYGEN_FOLDER} \\"
echo "-x\*.gitignore;" echo "-x\*.gitignore;"
fi; fi;
echo "Download: ${ROOT_FOLDER}${output_zip_folder}${output_zip}"; echo "Download: ${ROOT_FOLDER}${output_zip_folder}${output_zip}";
# cleam up user log file and ssh keys # cleam up user log file and ssh keys
if [ ${TEST} -eq 0 ]; then if [ ${TEST} -eq 0 ]; then
# move pub to created folders # move pub to created folders
mv "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*.pub "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB}"; mv "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*.pub "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB}";
# delete the rest # delete the rest
rm "${ROOT_FOLDER}${output_file}"; rm "${ROOT_FOLDER}${output_file}";
rm "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*; rm "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*;
else else
echo "$> mv ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*.pub ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB};"; echo "$> mv ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*.pub ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB};";
echo "$> rm ${ROOT_FOLDER}${output_file}"; echo "$> rm ${ROOT_FOLDER}${output_file}";
echo "$> rm ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*"; echo "$> rm ${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}*";
fi;
fi; fi;
# __END__ # __END__