From 692651c0a6c0bdcf6c0134bd69a66ecbcd3bf1ff Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@colivre.coop.br>
Date: Mon, 13 Jan 2014 21:22:28 -0300
Subject: [PATCH] fix quick-install to run on a clean system

---
 script/install-dependencies/debian-squeeze.sh |  3 ++-
 script/quick-start                            | 19 +++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/script/install-dependencies/debian-squeeze.sh b/script/install-dependencies/debian-squeeze.sh
index 75e0026..fd2b100 100644
--- a/script/install-dependencies/debian-squeeze.sh
+++ b/script/install-dependencies/debian-squeeze.sh
@@ -1,10 +1,11 @@
 # needed to run noosfero
 runtime_dependencies=$(sed -e '1,/^Depends:/d; /^Recommends:/,$ d; s/([^)]*)//g; s/,\s*/\n/g' debian/control | grep -v 'memcached\|debconf\|dbconfig-common\|postgresql\|misc:Depends\|adduser\|mail-transport-agent')
+run sudo apt-get update
 run sudo apt-get -y install $runtime_dependencies
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
 
 # needed for development
-run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql
+run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre
 gem which bundler >/dev/null 2>&1 || gem_install bundler
 setup_rubygems_path
 run bundle install
diff --git a/script/quick-start b/script/quick-start
index e6a952d..01ba5d4 100755
--- a/script/quick-start
+++ b/script/quick-start
@@ -30,6 +30,10 @@ gem_install() {
 }
 
 setup_rubygems_path() {
+  local dir="$(ruby -rubygems -e 'puts Gem.dir')/bin"
+  if [ -d "$dir" ]; then
+    export PATH="$dir:$PATH"
+  fi
   local dir="$(ruby -rubygems -e 'puts Gem.user_dir')/bin"
   if [ -d "$dir" ]; then
     export PATH="$dir:$PATH"
@@ -67,25 +71,16 @@ else
 fi
 
 # create the database with sample data
-if test -e config/database.yml; then
+if test -e config/database.yml && test "$force_install" = 'false'; then
   say 'Not updating existent database.yml.'
   say 'If you wish to automatic reconfigure your database connection, you can delete config/database.yml and run this script again.'
 else
   say 'Configuring Noosfero to use PostgreSQL, with your user.'
   run cp config/database.yml.pgsql config/database.yml
   sed -ri "s/username: noosfero/username: $USER/" config/database.yml
-  sudo -u postgres createuser $USER --no-superuser --createdb --no-createrole
-fi
-DB_USER="$(
-  grep username: config/database.yml | head -n1 | sed -r 's/.*:\s*([^ ]+).*/\1/'
-)"
-if test -n "$DB_USER"; then
-  say "DB user: $DB_USER"
-else
-  say 'It looks like your database.yml have no user defined'
-  DB_USER=$USER
+  sudo su - postgres -c "createuser $USER --no-superuser --createdb --no-createrole"
+  sudo su - postgres -c "createdb noosfero_development -O $USER"
 fi
-sudo -u postgres createdb noosfero_development -O $DB_USER
 run rake db:schema:load
 run rake db:data:minimal
 run rake db:test:prepare
--
libgit2 0.21.2