Merge pull request #73 from boxen/minor-usr-local-fixes

Minor custom rootdir fixes
boxen · Dec 11, 2014 · 30fb50d · 30fb50d
2 parents 504759e + 3c34fa8
commit 30fb50d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -46,7 +46,7 @@
           ]:
     ensure  => 'directory',
     owner   => $::boxen_user,
-    group   => 'admin',
+    group   => 'staff',
     mode    => '0755',
     require => undef,
     before  => Exec["install homebrew to ${installdir}"],
@@ -93,6 +93,7 @@
   file {
     [
       "${boxen::config::envdir}/homebrew.sh",
+      "${boxen::config::envdir}/30_homebrew.sh",
       "${boxen::config::envdir}/cflags.sh",
       "${boxen::config::envdir}/ldflags.sh",
     ]:
@@ -102,6 +103,6 @@
   ->
   boxen::env_script { 'homebrew':
     content  => template('homebrew/env.sh.erb'),
-    priority => higher,
+    priority => highest,
   }
 }
diff --git a/templates/env.sh.erb b/templates/env.sh.erb
@@ -10,3 +10,11 @@ export CFLAGS="-I$HOMEBREW_ROOT/include"
 <% if @set_ldflags %>
 export LDFLAGS="-L$HOMEBREW_ROOT/lib"
 <% end %>
+
+# Add homebrew'd stuff to the path.
+
+export PATH=$HOMEBREW_ROOT/bin:$HOMEBREW_ROOT/sbin:$PATH
+
+# Add homebrew'd stuff to the manpath.
+
+export MANPATH=$HOMEBREW_ROOT/share/man:$MANPATH