From 80511d065bd49b6105d169c537b87b081f2140d4 Mon Sep 17 00:00:00 2001
From: Florian Staudacher <florian_staudacher@yahoo.de>
Date: Thu, 10 May 2012 17:54:43 +0200
Subject: [PATCH] don't block stdin when using install script [ci skip]

---
 README.md         | 4 ++--
 script/install.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a0a30aa9c..5fa615007 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ looking to contribute to D*.  This script assumes you have [a basic Rails setup
 
 ### Step 1: Run the script and follow the on screen instructions.
 ```
-  curl https://raw.github.com/diaspora/diaspora/master/script/install.sh | /bin/sh
+  bash <(curl https://raw.github.com/diaspora/diaspora/master/script/install.sh)
 ```
 
 
@@ -59,4 +59,4 @@ Before submitting code, please sign our [Contributor License Agreement](https://
 - [Contributing](https://github.com/diaspora/diaspora/wiki/Getting-Started-With-Contributing)
 - [Dev List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-dev)
 - [Discuss List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-discuss)
-- [IRC](https://github.com/diaspora/diaspora/wiki/How-we-use-IRC)
\ No newline at end of file
+- [IRC](https://github.com/diaspora/diaspora/wiki/How-we-use-IRC)
diff --git a/script/install.sh b/script/install.sh
index 2cefafc51..23092e7da 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -101,7 +101,7 @@ interactive_check() {
     echo ""
   else
     # non-interactive
-    TMPFILE='mktemp'
+    TMPFILE=`mktemp`
     curl -s -o "$TMPFILE" "$D_INSTALL_SCRIPT_URL"
     chmod +x "$TMPFILE"
     exec 0< /dev/tty
@@ -223,7 +223,7 @@ database_setup() {
 #                                                                   #
 ####                                                             ####
 
-interactive_check
+#interactive_check
 
 
 # display a nice welcome message