From f1361bbad2c4a1aea781e284470b303a523f97b4 Mon Sep 17 00:00:00 2001
From: jutty <j@jutty.dev>
Date: Sun, 14 Jul 2024 06:50:14 -0300
Subject: [PATCH] Continue prompting until conflict is resolved

---
 src/package/package_conflict_resolution.sh | 16 ++++++++++------
 src/package/package_tracking.sh            |  2 --
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/package/package_conflict_resolution.sh b/src/package/package_conflict_resolution.sh
index a6789e8..9dc5233 100644
--- a/src/package/package_conflict_resolution.sh
+++ b/src/package/package_conflict_resolution.sh
@@ -45,19 +45,23 @@ not_on_configuration_dialog() {
     log debug "Input: input_packages = $input_packages"
     if validate_input_packages "$input_packages"; then
       package_manager uninstall "$input_packages"
-    else
-      not_on_configuration_dialog "$conflicted_packages"
     fi
   elif [ "$strategy" = 3 ]; then
-    track_packages "$conflicted_packages"
+    if validate_input_packages "$conflicted_packages"; then
+      track_packages "$conflicted_packages"
+    fi
   elif [ "$strategy" = 4 ]; then
     read -r -p "Enter space-separated packages to add to the configuation: " input_packages
     log debug "Input: input_packages = $input_packages"
-    track_packages "$input_packages"
+    if validate_input_packages "$input_packages"; then
+      track_packages "$input_packages"
+    fi
   else
     log debug "[resolve_packages] Unexpected input: $strategy"
     not_on_configuration_dialog "$conflicted_packages"
   fi
+
+  check
 }
 
 not_installed_dialog() {
@@ -84,8 +88,6 @@ not_installed_dialog() {
     log debug "Input: input_packages = $input_packages"
     if validate_input_packages "$input_packages"; then
       package_manager install "$input_packages"
-    else
-      not_on_configuration_dialog "$conflicted_packages"
     fi
   elif [ "$strategy" = 3 ]; then
     untrack_packages "$conflicted_packages"
@@ -97,4 +99,6 @@ not_installed_dialog() {
     log debug "[resolve_packages] Unexpected input: $strategy"
     not_installed_dialog "$conflicted_packages"
   fi
+
+  check
 }
diff --git a/src/package/package_tracking.sh b/src/package/package_tracking.sh
index 97ece67..f011270 100644
--- a/src/package/package_tracking.sh
+++ b/src/package/package_tracking.sh
@@ -1,8 +1,6 @@
 track_packages() {
   local packages="$1"
 
-  validate_input_packages "$packages"
-
   echo "$packages" | xargs | sed 's/ /\n/g' | while read -r package; do
     echo "$package" >> "$CONFIG_ROOT/packages"
   done