fix: trup

Author: TobiPeterG

deckifier/usr/bin/trup

@@ -11,9 +11,9 @@ monitor_progress() {
     local current_package=0
     local update_started=0
     local phase="Downloading" # Start with the Downloading phase
-
+    
     # Tail the log file and process each line
-    tail -f "$log_file" | while IFS= read -r line; do
+    tail -n 1000 -f "$log_file" | while IFS= read -r line; do
         # Check if the transactional-update process has started
         if [[ "$line" =~ Options:\ -c\ dup ]]; then
             update_started=1
@@ -31,12 +31,27 @@ monitor_progress() {
 
                 echo "$progress%"
             fi
+            
+            if [[ "$line" =~ In\ cache\ .*\(([0-9]+)/([0-9]+)\) ]]; then
+                current_package=${BASH_REMATCH[1]}
+                total_packages=${BASH_REMATCH[2]}
+
+                # Calculate overall progress for downloading
+                local progress=$((current_package * 100 / (2 * total_packages)))
+
+                echo "$progress%"
+            fi
 
             # Switch to Installation phase when "Checking for file conflicts:" line appears
             if [[ "$line" == *"Checking for file conflicts:"* ]] && [[ "$phase" == "Downloading" ]]; then
                 phase="Installing"
                 current_package=0 # Reset current package for installation phase
             fi
+            
+            if [[ "$line" == *"Preparing"* ]] && [[ "$phase" == "Downloading" ]]; then
+                phase="Installing"
+                current_package=0 # Reset current package for installation phase
+            fi
 
             # Parse the progress for installing
             if [[ "$phase" == "Installing" && "$line" =~ \(\ *([0-9]+)/([0-9]+)\)\ Installing:\ .*|\(\ *([0-9]+)/([0-9]+)\)\ Removing:\ .* ]]; then
@@ -60,15 +75,20 @@ monitor_progress() {
 }
 
 run_update() {
+    echo "0%"
     # Run the transactional-update command and redirect output to the log file
-    transactional-update -c run zypper --non-interactive dup --allow-vendor-change > "$log_file" 2>&1 &
+    transactional-update -c dup > "$log_file" 2>&1 &
     pid=$!
 
     # Start the monitor_progress function in the background
     monitor_progress &
+    pid2=$!
 
     # Wait for the transactional-update command to finish
     wait $pid
+    pkill $pid2 || true
+    pkill -P $$ tail || true
+    echo "100%"
 }
 
 check_update() {
@@ -134,7 +154,6 @@ main() {
         esac
     done
 
-    echo "0%"
     check_branch
     check_update
     exit_status=$?  # Capture the exit status of check_update