Commit 37bc8e66f5ea225699a677d6838cdb57e42a5dd7
Exists in
master
and in
22 other branches
Merge commit 'refs/merge-requests/192' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/192
Showing
1 changed file
with
6 additions
and
2 deletions
Show diff stats
script/quick-start
| @@ -21,8 +21,12 @@ run() { | @@ -21,8 +21,12 @@ run() { | ||
| 21 | fi | 21 | fi |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | -if gem which system_timer >/dev/null 2>&1 && which xvfb-run >/dev/null 2>&1; then | ||
| 25 | - say "Assuming dependencies are already installed. Pass --install to force their installation" | 24 | +force_install=false |
| 25 | +if test "$1" = '--force-install'; then | ||
| 26 | + force_install=true | ||
| 27 | +fi | ||
| 28 | +if gem which system_timer >/dev/null 2>&1 && which xvfb-run >/dev/null 2>&1 && test "$force_install" = 'false'; then | ||
| 29 | + say "Assuming dependencies are already installed. Pass --force-install to force their installation" | ||
| 26 | else | 30 | else |
| 27 | if !which lsb_release >/dev/null 2>&1; then | 31 | if !which lsb_release >/dev/null 2>&1; then |
| 28 | complain "E: lsb_release not available! (Try installing the lsb-release package)" | 32 | complain "E: lsb_release not available! (Try installing the lsb-release package)" |