Permalink
Browse files

fix solo support

  • Loading branch information...
1 parent 6ad0282 commit 3ffa1dd28f6832467c29d5a71d5647823356607d @hollow hollow committed Mar 15, 2013
@@ -81,7 +81,7 @@
default[:sysctl][:net][:netfilter][:nf_conntrack_tcp_timeout_established] = 432000
# skip hardware cookbooks
-default[:skip][:hardware] = node[:virtualization][:role] == "guest"
+default[:skip][:hardware] = node[:virtualization][:role] == "guest" rescue false
# provide sane default values in case ohai didn't find them
default_unless[:cpu][:total] = 1
@@ -1,6 +1,6 @@
module SystemdHelpers
def systemd_running?
- File.read("/proc/1/cmdline") =~ /systemd/
+ File.read("/proc/1/cmdline") =~ /systemd/ rescue false
end
end
@@ -6,7 +6,7 @@
maintainer_email "bb@xnull.de"
license "Apache v2.0"
-version "2.0.1"
+version "2.0.2"
supports "gentoo"
supports "mac_os_x"
@@ -10,7 +10,7 @@
cookbook "beanstalkd", "= 2.0.0"
cookbook "capistrano", "= 1.0.0"
cookbook "chef", "= 2.0.2"
-cookbook "core_ext", "= 2.0.1"
+cookbook "core_ext", "= 2.0.2"
cookbook "couchdb", "= 0.2.0"
cookbook "cron", "= 2.0.0"
cookbook "duply", "= 1.1.0"
@@ -4,10 +4,7 @@
echo ">>> Setting XCode to /Applications/Xcode.app"
sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer || exit 1
-# updates
-echo ">>> Installing Mac OS X software updates"
-sudo softwareupdate -ia || exit 1
-
+# reset homebrew repo
echo ">>> Bootstrapping Homebrew"
sudo rm -rf /usr/local/.git
sudo git clone --bare https://github.com/mxcl/homebrew /usr/local/.git
@@ -26,7 +23,8 @@ brew install autoconf automake apple-gcc42 libtool pkg-config openssl readline l
# bootstrap rvm/bundler
$(dirname $0)/bootstrap || exit 1
-source ~/.rvm/scripts/rvm && source .rvmrc
+source ~/.rvm/scripts/rvm || exit 1
+source .rvmrc || exit 1
# run rake solo
rake solo || exit 1

0 comments on commit 3ffa1dd

Please sign in to comment.