From 5f45a273d90554133c9339f0872f2bdd4bded4c8 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 7 Mar 2012 15:43:12 -0300 Subject: [PATCH] remove debian/bootstrap; enhance script/quick-start-debian --- debian/bootstrap | 5 ----- script/quick-start-debian | 12 +++++------- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100755 debian/bootstrap diff --git a/debian/bootstrap b/debian/bootstrap deleted file mode 100755 index cef7c9f..0000000 --- a/debian/bootstrap +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -runtime_dependencies=$(sed -e '/^Depends:.*rails/!d; s/Depends: //; s/([^)]*)//g; s/,\s*/\n/g' debian/control | grep -v 'memcached\|debconf\|dbconfig-common\|postgresql\|misc:Depends\|adduser') -test_dependencies="libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb" -apt-get -y install $runtime_dependencies $test_dependencies diff --git a/script/quick-start-debian b/script/quick-start-debian index 2238adb..49837ee 100755 --- a/script/quick-start-debian +++ b/script/quick-start-debian @@ -1,7 +1,8 @@ #!/bin/sh say() { - echo -e "\033[33;01m$@\033[m" + msg="$@" + printf "\033[33;01m%s\033[m\n" "$msg" } run() { @@ -15,12 +16,9 @@ run() { fi } -# Until Lenny tango-icon-theme is only available in non-free, so maybe we need -# to download it manually -run "sudo apt-get -y install tango-icon-theme || (wget http://ftp.br.debian.org/debian/pool/non-free/t/tango-icon-theme/tango-icon-theme_0.8.1-4_all.deb && sudo dpkg -i tango-icon-theme_0.8.1-4_all.deb)" - # needed to run noosfero -run sudo apt-get -y install rails ruby rake libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby mongrel mongrel-cluster +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 -y install $runtime_dependencies # needed for development run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb @@ -28,7 +26,7 @@ run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagi # create the database with sample data run cp config/database.yml.sqlite3 config/database.yml run rake db:schema:load -run ./script/sample-data +run rake db:data:minimal # compile translations run rake noosfero:translations:compile -- libgit2 0.21.2