diff --git a/src/index.sh b/src/index.sh index 247e978..17e9813 100644 --- a/src/index.sh +++ b/src/index.sh @@ -5,5 +5,6 @@ . "$TORI_ROOT/src/package/package_manager.sh" . "$TORI_ROOT/src/package/package_conflict_resolution.sh" +. "$TORI_ROOT/src/package/package_tracking.sh" . "$TORI_ROOT/src/package/validate_input_packages.sh" . "$TORI_ROOT/src/package/update_package_cache.sh" diff --git a/src/package/package_conflict_resolution.sh b/src/package/package_conflict_resolution.sh index df8fff7..a6789e8 100644 --- a/src/package/package_conflict_resolution.sh +++ b/src/package/package_conflict_resolution.sh @@ -48,6 +48,12 @@ not_on_configuration_dialog() { else not_on_configuration_dialog "$conflicted_packages" fi + elif [ "$strategy" = 3 ]; then + track_packages "$conflicted_packages" + 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" else log debug "[resolve_packages] Unexpected input: $strategy" not_on_configuration_dialog "$conflicted_packages" @@ -81,6 +87,12 @@ not_installed_dialog() { else not_on_configuration_dialog "$conflicted_packages" fi + elif [ "$strategy" = 3 ]; then + untrack_packages "$conflicted_packages" + elif [ "$strategy" = 4 ]; then + read -r -p "Enter space-separated packages to remove from the configuation: " input_packages + log debug "Input: input_packages = $input_packages" + untrack_packages "$input_packages" else log debug "[resolve_packages] Unexpected input: $strategy" not_installed_dialog "$conflicted_packages" diff --git a/src/package/package_manager.sh b/src/package/package_manager.sh index 2f99321..10930ca 100644 --- a/src/package/package_manager.sh +++ b/src/package/package_manager.sh @@ -1,6 +1,5 @@ package_manager() { local command="$1" - local output local manager local authorizer="sudo" diff --git a/src/package/package_tracking.sh b/src/package/package_tracking.sh new file mode 100644 index 0000000..97ece67 --- /dev/null +++ b/src/package/package_tracking.sh @@ -0,0 +1,17 @@ +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 +} + +untrack_packages() { + local packages="$1" + + echo "$packages" | xargs | sed 's/ /\n/g' | while read -r package; do + sed -i '' "/^$package$/d" "$CONFIG_ROOT/packages" + done +}