[arkdep] Code cleanup

This commit is contained in:
Dennis ten Hoove 2024-07-16 13:38:43 +02:00
parent b2a563c6c4
commit f768a7155b
No known key found for this signature in database
GPG key ID: 2BA91DC2563B83D1

10
arkdep
View file

@ -524,13 +524,14 @@ get_update () {
# TODO: Very basic implementation, expand later # TODO: Very basic implementation, expand later
# Set default variant as update_target unless param provided # Set default new variant as new_update_target unless param provided
if [[ -n $1 ]] && [[ $1 != '-' ]]; then if [[ -n $1 ]] && [[ $1 != '-' ]]; then
declare -r new_update_target=$1 declare -r new_update_target=$1
else else
declare -r new_update_target=$repo_default_image declare -r new_update_target=$repo_default_image
fi fi
# Set default old variant as old_update_target unless param provided
if [[ -n $2 ]] && [[ $2 != '-' ]]; then if [[ -n $2 ]] && [[ $2 != '-' ]]; then
declare -r old_update_target=$2 declare -r old_update_target=$2
else else
@ -555,6 +556,7 @@ get_update () {
declare -r deployment_id_old=${mountinfo##*/} # Remove everything before ID declare -r deployment_id_old=${mountinfo##*/} # Remove everything before ID
fi fi
# Check if pkgs files actually available
declare status_code_new=$(curl -s -o /dev/null --write-out "%{http_code}" $repo_url/$new_update_target/$deployment_id_new.pkgs) declare status_code_new=$(curl -s -o /dev/null --write-out "%{http_code}" $repo_url/$new_update_target/$deployment_id_new.pkgs)
# Error if server returned a status code other than 200 # Error if server returned a status code other than 200
@ -572,6 +574,7 @@ get_update () {
exit 1 exit 1
fi fi
# Check if we are already running the latest update
if [[ $deployment_id_old == $deployment_id_new ]]; then if [[ $deployment_id_old == $deployment_id_new ]]; then
printf 'Already on latest version\n' printf 'Already on latest version\n'
exit 0 exit 0
@ -588,6 +591,7 @@ get_update () {
declare removed=() declare removed=()
declare added=() declare added=()
# Process new_pkgs list to generate update diff
for pkg in "${new_pkgs[@]}"; do for pkg in "${new_pkgs[@]}"; do
# Split package name and package versions in to list # Split package name and package versions in to list
declare spaced=($pkg) declare spaced=($pkg)
@ -597,6 +601,7 @@ get_update () {
continue continue
fi fi
# Compare new pkgs to old ones
for old_pkg in "${old_pkgs[@]}"; do for old_pkg in "${old_pkgs[@]}"; do
# Split package name and package versions in to list # Split package name and package versions in to list
declare old_spaced=($old_pkg) declare old_spaced=($old_pkg)
@ -618,7 +623,7 @@ get_update () {
# Temporary hard code setting # Temporary hard code setting
update_print_mode='list' update_print_mode='list'
# Loop and print changed packages and diff # Print changed packages and diff
if [[ $update_print_mode == 'list' ]]; then if [[ $update_print_mode == 'list' ]]; then
num=0 num=0
@ -629,6 +634,7 @@ get_update () {
done done
fi fi
# Print new packages as added
if [[ ${#added[@]} -ne 0 ]]; then if [[ ${#added[@]} -ne 0 ]]; then
printf '\nNew:\n' printf '\nNew:\n'
for add in "${added[@]}"; do for add in "${added[@]}"; do