OSX installer tweaks: everyone does brew update, add link to irc when rvm install fails
This commit is contained in:
parent
0fd15107ab
commit
a9292df275
1 changed files with 5 additions and 5 deletions
|
|
@ -22,19 +22,19 @@ task :install do
|
||||||
REDIS_INSTALLED = installed?('redis-server')
|
REDIS_INSTALLED = installed?('redis-server')
|
||||||
IMAGEMAGICK_INSTALLED = installed?('mogrify')
|
IMAGEMAGICK_INSTALLED = installed?('mogrify')
|
||||||
XCODE_INSTALLED = installed?('gcc')
|
XCODE_INSTALLED = installed?('gcc')
|
||||||
# TODO: check for xcode install
|
|
||||||
|
|
||||||
unless XCODE_INSTALLED
|
unless XCODE_INSTALLED
|
||||||
puts "you need to install XCode before running this script"
|
puts "You need to install XCode before running this script. :("
|
||||||
puts "you can get it from your OSX install cd, or from Apple's developer page"
|
puts "You can get it from your OSX install DVD, or from Apple's developer page."
|
||||||
Process.exit
|
Process.exit
|
||||||
end
|
end
|
||||||
|
puts "Hooray! You have XCode already!"
|
||||||
|
|
||||||
unless BREW_INSTALLED
|
unless BREW_INSTALLED
|
||||||
puts "Installing homebrew..."
|
puts "Installing homebrew..."
|
||||||
system("ruby -e \"$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)\"")
|
system("ruby -e \"$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)\"")
|
||||||
system("brew update")
|
|
||||||
end
|
end
|
||||||
|
system("brew update")
|
||||||
puts "homebrew is installed. Great job!"
|
puts "homebrew is installed. Great job!"
|
||||||
|
|
||||||
unless RVM_INSTALLED
|
unless RVM_INSTALLED
|
||||||
|
|
@ -43,7 +43,7 @@ task :install do
|
||||||
system("echo '[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && . \"$HOME/.rvm/scripts/rvm\" # Load RVM function' >> ~/.bash_profile")
|
system("echo '[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && . \"$HOME/.rvm/scripts/rvm\" # Load RVM function' >> ~/.bash_profile")
|
||||||
system("rm rvm-installer")
|
system("rm rvm-installer")
|
||||||
if `. ~/.bash_profile; type rvm | head -1` != "rvm is a function\n"
|
if `. ~/.bash_profile; type rvm | head -1` != "rvm is a function\n"
|
||||||
puts "meh, rvm install failed."
|
puts "Meh, rvm install failed. Come talk to us in irc, at http://webchat.freenode.net/?channels=diaspora"
|
||||||
Process.exit
|
Process.exit
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue