From 882c7cfacf8df3f0adb628f4e5a5fa170178798e Mon Sep 17 00:00:00 2001
From: Lutchy Horace <bugzbunny@bugzbunny.net>
Date: Mon, 8 Jan 2024 23:03:28 -0500
Subject: [PATCH] Remove timeout, remove temp script, and catch exit status

---
 borgbackup.sh | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/borgbackup.sh b/borgbackup.sh
index 9fff3c3..fa6b8bf 100755
--- a/borgbackup.sh
+++ b/borgbackup.sh
@@ -49,12 +49,14 @@ if test -f /etc/borgbackup.conf; then
 	source /etc/borgbackup.conf
 fi
 
-# Define the expect script in a variable
-expect_script=$(cat <<END_EXPECT
+echo "Running PREHOOK..."
+eval $PREHOOK
+
+echo "Running borg backup.."
+expect <<END_EXPECT
 #!/usr/bin/expect -f
 
-# Set the timeout for waiting
-set timeout 30
+set timeout -1
 
 # Set the passphrase
 set _passphrase "$PASSPHRASE"
@@ -68,25 +70,21 @@ send "\$_passphrase\r"
 
 # Wait for the command to finish
 expect eof
+
+foreach {pid spawnid os_error_flag value} [wait] break
+
+if {\$os_error_flag == 0} {
+     puts "exit status: \$value"
+     exit \$value
+} else {
+     puts "errno: \$value"
+     exit \$value
+}
 END_EXPECT
-)
 
-echo "Running PREHOOK..."
-eval $PREHOOK
-
-echo "Running borg backup.."
-# Save the expect script to a temporary file
-expect_script_file=$(mktemp)
-echo "$expect_script" > "$expect_script_file"
-
-# Make the temporary expect script executable
-chmod +x "$expect_script_file"
-
-# Execute the expect script
-$expect_script_file
-
-# Clean up the temporary expect script
-rm -f "$expect_script_file"
+echo "Borg exit status: exit_status=$?"
 
 echo "Running POSTHOOK..."
-eval $POSTHOOK
\ No newline at end of file
+eval $POSTHOOK
+
+exit $exit_status
\ No newline at end of file