ScriptsCollections/ServerUserCreate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into shellecheck-cleanup

Browse Source
This commit is contained in:
Clemens Schwaighofer
2024-09-04 14:05:51 +09:00
parent e4ed6fed8d 83f84abd46
commit ee7cc8555e
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bin/create_user.sh
View File

@@ -420,14 +420,24 @@ done <<< "$(cat "${ROOT_FOLDER}${input_file}")";
if [ ${INFO} -eq 1 ]; then if [ ${INFO} -eq 1 ]; then
exit; exit;
fi; fi;
# check if there are any files in the SSH_KEYGEN_FOLDER, else skip zip file creation and file move
has_pem_files=0;
if (shopt -s nullglob dotglob; f=("${SSH_KEYGEN_FOLDER}"*".pem"*); ((${#f[@]}))); then
has_pem_files=1;
fi;
# zip everything and remove data in ssh key folder, delete output file with passwords # zip everything and remove data in ssh key folder, delete output file with passwords
if [ ${TEST} -eq 0 ]; then if [ ${TEST} -eq 0 ]; then
zip -r \ if [ "${has_pem_files}" -eq 1 ]; then
"${ROOT_FOLDER}${output_zip_folder}${output_zip}" \ zip -r \
"${input_file}" \ "${ROOT_FOLDER}${output_zip_folder}${output_zip}" \
"${output_file}" \ "${input_file}" \
"${SSH_KEYGEN_FOLDER}" \ "${output_file}" \
-x\*.gitignore; "${SSH_KEYGEN_FOLDER}" \
-x\*.gitignore;
echo "Download: ${ROOT_FOLDER}${output_zip_folder}${output_zip}";
else
echo "Skip ZIP file creation, no pem files";
fi;
else else
echo "zip -r \\" echo "zip -r \\"
echo "${ROOT_FOLDER}${output_zip_folder}${output_zip} \\" echo "${ROOT_FOLDER}${output_zip_folder}${output_zip} \\"
@@ -435,15 +445,19 @@ else
echo "${output_file} \\" echo "${output_file} \\"
echo "${SSH_KEYGEN_FOLDER} \\" echo "${SSH_KEYGEN_FOLDER} \\"
echo "-x\*.gitignore;" echo "-x\*.gitignore;"
echo "Download: ${ROOT_FOLDER}${output_zip_folder}${output_zip}";
fi; fi;
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 if [ "${has_pem_files}" -eq 1 ]; then
mv "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*.pub "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB}"; # move pub to created folders
# delete the rest mv "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*.pub "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER_CREATED_PUB}";
rm "${ROOT_FOLDER}${output_file}"; # delete the rest
rm "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*; rm "${ROOT_FOLDER}${output_file}";
rm "${ROOT_FOLDER}${SSH_KEYGEN_FOLDER}"*;
else
echo "Skip pub file move and cleanup, no pem files";
fi;
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}";