[Swift-commit] r7324 - trunk/libexec

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-25 09:30:53 -0600 (Mon, 25 Nov 2013)
New Revision: 7324

Modified:
   trunk/libexec/_swiftwrap
Log:
Fix for stdin on macs (bugzilla #1159)


Modified: trunk/libexec/_swiftwrap
===================================================================
--- trunk/libexec/_swiftwrap	2013-11-25 08:01:57 UTC (rev 7323)
+++ trunk/libexec/_swiftwrap	2013-11-25 15:30:53 UTC (rev 7324)
@@ -505,8 +505,14 @@
 		if [ "$SWIFT_GEN_SCRIPTS" != "" ]; then
 			genScripts
 		fi
-        "$TIMECMD" "${TIMEARGS[@]}" "$EXEC" "${CMDARGS[@]}" 1>>"$STDOUT" 2>>"$STDERR" <"$STDIN"
+        	
+		if [ -n "$TIMECMD" ] && [ -n "$TIMEARGS" ]; then
+               		"$TIMECMD" "${TIMEARGS[@]}" "$EXEC" "${CMDARGS[@]}" 1>>"$STDOUT" 2>>"$STDERR" <"$STDIN"
+       	 	else         
+           		"$EXEC" "${CMDARGS[@]}" 1>>"$STDOUT" 2>>"$STDERR" <"$STDIN"
+        	fi  
 	fi
+
     TIME_EC=$?
     if [ "_$TIMECMD" != _ ]; then
 		log "$(cat swiftapp.resources)"