Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Convert 'core software' deps to use 'bin' instead of 'managed'.

  • Loading branch information...
commit 9bbd99a5cbbd19af67efa5671708ddb4ec512421 1 parent 6568ad1
@benhoskings authored
Showing with 16 additions and 19 deletions.
  1. +12 −15 packages.rb
  2. +3 −3 top level.rb
  3. +1 −1  unicorn.rb
View
27 packages.rb
@@ -30,7 +30,7 @@
dep 'git-smart.gem' do
provides %w[git-smart-log git-smart-merge git-smart-pull]
end
-dep 'htop.managed'
+dep 'htop.bin'
dep 'imagemagick.managed' do
provides %w[compare animate convert composite conjure import identify stream display montage mogrify]
end
@@ -38,14 +38,12 @@
requires 'freeimage.managed'
provides []
end
-dep 'iotop.managed'
+dep 'iotop.bin'
dep 'java.managed' do
installs { via :apt, 'sun-java6-jre' }
after { shell "set -Ux JAVA_HOME /usr/lib/jvm/java-6-sun" }
end
-dep 'jnettop.managed' do
- installs { via :apt, 'jnettop' }
-end
+dep 'jnettop.bin'
dep 'readline headers.managed' do
installs {
on :lenny, 'libreadline5-dev'
@@ -85,7 +83,7 @@
}
provides []
end
-dep 'lsof.managed'
+dep 'lsof.bin'
dep 'memcached.managed'
dep 'ncurses.managed' do
installs {
@@ -94,7 +92,7 @@
}
provides []
end
-dep 'nmap.managed'
+dep 'nmap.bin'
dep 'oniguruma.managed'
dep 'pcre.managed' do
installs {
@@ -104,30 +102,29 @@
}
provides 'pcre-config'
end
-dep 'pv.managed'
+dep 'pv.bin'
dep 'rcconf.managed' do
installs { via :apt, 'rcconf' }
end
-dep 'sed.managed' do
+dep 'sed.bin' do
installs {
via :brew, 'gnu-sed'
}
- provides 'sed'
after {
cd pkg_manager.bin_path do
shell "ln -s gsed sed", :sudo => pkg_manager.should_sudo?
end
}
end
-dep 'sshd.managed' do
+dep 'sshd.bin' do
installs {
via :apt, 'openssh-server'
}
end
-dep 'tmux.managed'
-dep 'traceroute.managed'
-dep 'tree.managed'
-dep 'vim.managed'
+dep 'tmux.bin'
+dep 'traceroute.bin'
+dep 'tree.bin'
+dep 'vim.bin'
dep 'wget.managed'
dep 'yaml headers.managed' do
installs {
View
6 top level.rb
@@ -53,8 +53,8 @@
dep 'core software' do
requires {
- on :lenny, 'sudo.bin', 'lsof.managed', 'vim.managed', 'curl.bin', 'traceroute.managed', 'htop.managed', 'iotop.managed', 'jnettop.managed', 'nmap.managed', 'tree.managed', 'pv.managed'
- on :linux, 'sudo.bin', 'lsof.managed', 'vim.managed', 'curl.bin', 'traceroute.managed', 'htop.managed', 'iotop.managed', 'jnettop.managed', 'tmux.managed', 'nmap.managed', 'tree.managed', 'pv.managed'
- on :osx, 'nmap.managed', 'tree.managed', 'pv.managed'
+ on :lenny, 'sudo.bin', 'lsof.bin', 'vim.bin', 'curl.bin', 'traceroute.bin', 'htop.bin', 'iotop.bin', 'jnettop.bin', 'nmap.bin', 'tree.bin', 'pv.bin'
+ on :linux, 'sudo.bin', 'lsof.bin', 'vim.bin', 'curl.bin', 'traceroute.bin', 'htop.bin', 'iotop.bin', 'jnettop.bin', 'tmux.bin', 'nmap.bin', 'tree.bin', 'pv.bin'
+ on :osx, 'nmap.bin', 'tree.bin', 'pv.bin'
}
end
View
2  unicorn.rb
@@ -24,7 +24,7 @@ def missing_paths
dep 'unicorn running', :app_root, :env do
app_root.default('~/current')
- requires 'lsof.managed'
+ requires 'lsof.bin'
met? {
if !(app_root / 'config/unicorn.rb').exists?
log "Not starting any unicorns because there's no unicorn config."
Please sign in to comment.
Something went wrong with that request. Please try again.