From 211a8d195a90bb2d422f2fd9c5985d9bc0c8d26f Mon Sep 17 00:00:00 2001
From: "nahee.app" <nahee@sanctuary.computer>
Date: Wed, 18 Dec 2024 18:14:22 +0900
Subject: [PATCH] Update zcli-login.expect

---
 bin/zcli-login.expect | 46 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/bin/zcli-login.expect b/bin/zcli-login.expect
index b22018f63..46f10fb6d 100644
--- a/bin/zcli-login.expect
+++ b/bin/zcli-login.expect
@@ -1,18 +1,48 @@
 #!/usr/bin/expect -f
 
+# Set an unlimited timeout
 set timeout -1
 
-# Define environment variables
+# Capture arguments
 set subdomain [lindex $argv 0]
 set email [lindex $argv 1]
 set token [lindex $argv 2]
 
-# Run zcli login
+# Spawn the zcli login command
 spawn zcli login -i
-expect "Subdomain:"
-send "$subdomain\r"
-expect "Email:"
-send "$email\r"
-expect "API Token:"
-send "$token\r"
+
+# Handle Subdomain prompt
+expect {
+    "Subdomain:" {
+        send "$subdomain\r"
+    }
+    timeout {
+        puts "Error: Timeout while waiting for 'Subdomain:' prompt"
+        exit 1
+    }
+}
+
+# Handle Email prompt
+expect {
+    "Email:" {
+        send "$email\r"
+    }
+    timeout {
+        puts "Error: Timeout while waiting for 'Email:' prompt"
+        exit 1
+    }
+}
+
+# Handle API Token prompt
+expect {
+    "API Token:" {
+        send "$token\r"
+    }
+    timeout {
+        puts "Error: Timeout while waiting for 'API Token:' prompt"
+        exit 1
+    }
+}
+
+# Wait for the process to complete
 expect eof