bin/git_cap in magic_recipes-0.0.29 vs bin/git_cap in magic_recipes-0.1.0

@@ -1,39 +1,51 @@
 #!/usr/bin/expect -f
+# 
 # Expect script to supply username/password to cap deploy to git private repository
+# 
 # This script needs username and password as arguments to connect to git server:
 # ------------------------------------------------------------------------
 # ./git_cap gitusr gitpwd
 # -------------------------------------------------------------------------
+# 
 # set Variables
-set g_user [lrange $argv 0 0] 
-set g_pwd [lrange $argv 1 1]   
-set timeout -1   
+# 
+set g_user [lrange $argv 0 0]
+set g_pwd [lrange $argv 1 1]
+# 
+# Regular Expressions ... http://docs.activestate.com/activetcl/8.5/expect4win/regex.html
+# 
+set ulook ".?sername for 'https:\/\/github\.com':.*"
+set plook ".?assword for .*@github\.com':.*"
+# 
+# set TimeOut
+# 
+set timeout -1
 
+# 
+# start deployment .. expects git_user + git_password 2 times !
+# 
+
 spawn cap deploy
 match_max 100000
 
 # Look for user prompt
-# expect "*?sername:*"
-expect "*?sername for 'https://github.com':*"
+expect -re $ulook
 send -- "$g_user\r"
 send -- "\r"
 
 # Look for passwod prompt
-# expect "*?assword:*"
-expect "*?assword for *@github.com':*"
+expect -re $plook
 send -- "$g_pwd\r"
 send -- "\r"
 
 # Look for user prompt
-# expect "*?sername:*"
-expect "*?sername for 'https://github.com':*"
+expect -re $ulook
 send -- "$g_user\r"
 send -- "\r"
 
 # Look for passwod prompt
-# expect "*?assword:*"
-expect "*?assword for *@github.com':*"
+expect -re $plook
 send -- "$g_pwd\r"
 send -- "\r"
 
 expect eof
\ No newline at end of file