apadana/arkdep
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[arkdep] Miscellaneous code cleanup

Browse source
This commit is contained in:
Dennis ten Hoove 2024-07-11 17:47:02 +02:00
parent 339a102d3f
commit a91c398b6b
No known key found for this signature in database
GPG key ID: 2BA91DC2563B83D1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arkdep
View file

@ -54,7 +54,7 @@ fi
# Cleanup and quit if error # Cleanup and quit if error
cleanup_and_quit () { cleanup_and_quit () {
# If any paramters are passed we will assume it to be an error message # If any parameters are passed we will assume it to be an error message
[[ -n $1 ]] && printf "\e[1;31m<#>\e[0m $*\e[0m\n" >&2 [[ -n $1 ]] && printf "\e[1;31m<#>\e[0m $*\e[0m\n" >&2
# Ensure we do not try to remove our current deployment # Ensure we do not try to remove our current deployment
@ -180,6 +180,7 @@ cleanup () {
fi fi
exit 0 exit 0
} }
# Always healthcheck on run if requested in config, unless the user explicitely called it # Always healthcheck on run if requested in config, unless the user explicitely called it
@ -400,12 +401,10 @@ remove_deployment () {
fi fi
for deployment in ${@:2}; do for deployment in ${@:2}; do
# Ensure requested deployment is tracked # Ensure requested deployment is tracked
declare hits=($(grep $deployment $arkdep_dir/tracker)) declare hits=($(grep $deployment $arkdep_dir/tracker))
if [[ ${#hits[@]} -gt 1 ]]; then if [[ ${#hits[@]} -gt 1 ]]; then
# Check if there is an exact match # Check if there is an exact match
for hit in ${hits[@]}; do for hit in ${hits[@]}; do
if [[ $1 == $hit ]]; then if [[ $1 == $hit ]]; then
@ -471,7 +470,6 @@ remove_deployment () {
rm -v $arkdep_dir/cache/$target.tar.* rm -v $arkdep_dir/cache/$target.tar.*
fi fi
fi fi
done done
if [[ $remove_no_quit -ne 1 ]]; then if [[ $remove_no_quit -ne 1 ]]; then
@ -769,7 +767,6 @@ deploy () {
# Add overlay if enabled # Add overlay if enabled
if [[ $enable_overlay -eq 1 ]]; then if [[ $enable_overlay -eq 1 ]]; then
# If backup_user_accounts is enabled automatically perform a backup, do not run if custom root is defined # If backup_user_accounts is enabled automatically perform a backup, do not run if custom root is defined
if [[ $backup_user_accounts -eq 1 ]] && [[ ! -n $ARKDEP_ROOT ]]; then if [[ $backup_user_accounts -eq 1 ]] && [[ ! -n $ARKDEP_ROOT ]]; then
@ -840,7 +837,6 @@ deploy () {
cleanup_and_quit 'Failed to copy microcode' cleanup_and_quit 'Failed to copy microcode'
fi fi
done done
fi fi
# Install kernel and generate initramfs # Install kernel and generate initramfs