From e381d520d9fb725ccb087f3576bb046c642ed505 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 5 Feb 2015 01:00:33 -0500 Subject: [PATCH] Clean up rakefiles --- rake/node/io.rake | 2 ++ rake/pkg/emacs.rake | 8 ++------ rake/pkg/nodejs.rake | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/rake/node/io.rake b/rake/node/io.rake index a3732fa2..d7404aec 100644 --- a/rake/node/io.rake +++ b/rake/node/io.rake @@ -1,5 +1,7 @@ desc "My main computer" task :io do + sh "cd ~/.dotfiles && git pull" + [ "pkg:update", "pkg:osx", "pkg:nodejs", diff --git a/rake/pkg/emacs.rake b/rake/pkg/emacs.rake index 83b5aa71..607d7393 100644 --- a/rake/pkg/emacs.rake +++ b/rake/pkg/emacs.rake @@ -6,7 +6,6 @@ if is_mac? [ "emacs --with-gnutls --cocoa", "ispell", "cask", - "rsense", "markdown" ] end @@ -40,7 +39,7 @@ if is_mac? namespace :emacs do desc "Install emacs completely" - task :install => ["nodejs:install", :setup, :setup_node, :setup_emacs_d] + task :install => ["pkg:nodejs:install", :setup, :setup_node, :setup_emacs_d] desc "Setup required homebrew packages" task :setup do @@ -63,10 +62,7 @@ if is_mac? sh_safe "cd '#{ENV["EMACS_D"]}' && git pull && cask update" # Update node - sh_safe "/usr/local/bin/npm update -g #{node_reqs.join(' ')}" - - # Update rsense config - sh_safe "/usr/bin/env ruby `brew --prefix rsense`/libexec/etc/config.rb > ~/.rsense" + sh "/usr/local/bin/npm update -g #{node_reqs.join(' ')}" end end diff --git a/rake/pkg/nodejs.rake b/rake/pkg/nodejs.rake index 55e8f955..a09bbaf8 100644 --- a/rake/pkg/nodejs.rake +++ b/rake/pkg/nodejs.rake @@ -3,7 +3,7 @@ def node_installed? end desc "Ensure nodejs & its prerequisites are installed" -task :nodejs => "nodejs:update" +task :nodejs => "pkg:nodejs:update" namespace :nodejs do desc "Install node.js completely" @@ -20,8 +20,8 @@ namespace :nodejs do end end - unless node_installed? - task :update => "nodejs:install" do + if node_installed? + task :update => :install do echo "Updating node" if is_mac? Package.update "node"