jutty/tori
1
1
Fork 0
Code Issues Pull requests Releases 1 Activity

Continue prompting until conflict is resolved

Browse source
This commit is contained in:
Juno Takano 2024-07-14 06:50:14 -03:00
parent 6e18c205e9
commit f1361bbad2
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/package/package_conflict_resolution.sh
View file

@ -45,19 +45,23 @@ not_on_configuration_dialog() {
log debug "Input: input_packages = $input_packages" log debug "Input: input_packages = $input_packages"
if validate_input_packages "$input_packages"; then if validate_input_packages "$input_packages"; then
package_manager uninstall "$input_packages" package_manager uninstall "$input_packages"
else
not_on_configuration_dialog "$conflicted_packages"
fi fi
elif [ "$strategy" = 3 ]; then elif [ "$strategy" = 3 ]; then
track_packages "$conflicted_packages" if validate_input_packages "$conflicted_packages"; then
track_packages "$conflicted_packages"
fi
elif [ "$strategy" = 4 ]; then elif [ "$strategy" = 4 ]; then
read -r -p "Enter space-separated packages to add to the configuation: " input_packages read -r -p "Enter space-separated packages to add to the configuation: " input_packages
log debug "Input: input_packages = $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 else
log debug "[resolve_packages] Unexpected input: $strategy" log debug "[resolve_packages] Unexpected input: $strategy"
not_on_configuration_dialog "$conflicted_packages" not_on_configuration_dialog "$conflicted_packages"
fi fi
check
} }
not_installed_dialog() { not_installed_dialog() {
@ -84,8 +88,6 @@ not_installed_dialog() {
log debug "Input: input_packages = $input_packages" log debug "Input: input_packages = $input_packages"
if validate_input_packages "$input_packages"; then if validate_input_packages "$input_packages"; then
package_manager install "$input_packages" package_manager install "$input_packages"
else
not_on_configuration_dialog "$conflicted_packages"
fi fi
elif [ "$strategy" = 3 ]; then elif [ "$strategy" = 3 ]; then
untrack_packages "$conflicted_packages" untrack_packages "$conflicted_packages"
@ -97,4 +99,6 @@ not_installed_dialog() {
log debug "[resolve_packages] Unexpected input: $strategy" log debug "[resolve_packages] Unexpected input: $strategy"
not_installed_dialog "$conflicted_packages" not_installed_dialog "$conflicted_packages"
fi fi
check
} }

2
src/package/package_tracking.sh
View file

@ -1,8 +1,6 @@
track_packages() { track_packages() {
local packages="$1" local packages="$1"
validate_input_packages "$packages"
echo "$packages" | xargs | sed 's/ /\n/g' | while read -r package; do echo "$packages" | xargs | sed 's/ /\n/g' | while read -r package; do
echo "$package" >> "$CONFIG_ROOT/packages" echo "$package" >> "$CONFIG_ROOT/packages"
done done