don't block stdin when using install script [ci skip]
This commit is contained in:
parent
e0e8b47cb4
commit
80511d065b
2 changed files with 4 additions and 4 deletions
|
|
@ -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.
|
### 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)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ interactive_check() {
|
||||||
echo ""
|
echo ""
|
||||||
else
|
else
|
||||||
# non-interactive
|
# non-interactive
|
||||||
TMPFILE='mktemp'
|
TMPFILE=`mktemp`
|
||||||
curl -s -o "$TMPFILE" "$D_INSTALL_SCRIPT_URL"
|
curl -s -o "$TMPFILE" "$D_INSTALL_SCRIPT_URL"
|
||||||
chmod +x "$TMPFILE"
|
chmod +x "$TMPFILE"
|
||||||
exec 0< /dev/tty
|
exec 0< /dev/tty
|
||||||
|
|
@ -223,7 +223,7 @@ database_setup() {
|
||||||
# #
|
# #
|
||||||
#### ####
|
#### ####
|
||||||
|
|
||||||
interactive_check
|
#interactive_check
|
||||||
|
|
||||||
|
|
||||||
# display a nice welcome message
|
# display a nice welcome message
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue