nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't block stdin when using install script [ci skip]

Browse source
This commit is contained in:
Florian Staudacher 2012-05-10 17:54:43 +02:00
parent e0e8b47cb4
commit 80511d065b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -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)
``` ```
@ -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) - [Contributing](https://github.com/diaspora/diaspora/wiki/Getting-Started-With-Contributing)
- [Dev List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-dev) - [Dev List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-dev)
- [Discuss List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-discuss) - [Discuss List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-discuss)
- [IRC](https://github.com/diaspora/diaspora/wiki/How-we-use-IRC) - [IRC](https://github.com/diaspora/diaspora/wiki/How-we-use-IRC)

4
script/install.sh
View file

@ -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