Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removing a lot of marker file checks that didn't /seem/ necessary, us…

…ing the new zip_osx_install for textmate
  • Loading branch information...
commit bcf99db2f463242c8686bdd523dba3b1a88f1709 1 parent 4a7dbcf
Davis W. Frank & Matthew Kocher authored
View
4 recipes/bash_profile-better_history.rb
@@ -1,5 +1,3 @@
include_recipe "pivotal_workstation::bash_profile"
-run_unless_marker_file_exists("bash_profile-better_history") do
- bash_profile_include("better_history")
-end
+bash_profile_include("better_history")
View
114 recipes/git_config_global_defaults.rb
@@ -1,73 +1,71 @@
include_recipe "pivotal_workstation::git"
-run_unless_marker_file_exists("git_config_global") do
- execute "set alias st=status" do
- command "git config --global alias.st status"
- user WS_USER
- end
+execute "set alias st=status" do
+ command "git config --global alias.st status"
+ user WS_USER
+end
- execute "set alias di=diff" do
- command "git config --global alias.di diff"
- user WS_USER
- end
+execute "set alias di=diff" do
+ command "git config --global alias.di diff"
+ user WS_USER
+end
- execute "set alias co=checkout" do
- command "git config --global alias.co checkout"
- user WS_USER
- end
+execute "set alias co=checkout" do
+ command "git config --global alias.co checkout"
+ user WS_USER
+end
- execute "set alias ci=commit" do
- command "git config --global alias.ci commit"
- user WS_USER
- end
+execute "set alias ci=commit" do
+ command "git config --global alias.ci commit"
+ user WS_USER
+end
- execute "set alias br=branch" do
- command "git config --global alias.br branch"
- user WS_USER
- end
+execute "set alias br=branch" do
+ command "git config --global alias.br branch"
+ user WS_USER
+end
- execute "set alias sta=stash" do
- command "git config --global alias.sta stash"
- user WS_USER
- end
+execute "set alias sta=stash" do
+ command "git config --global alias.sta stash"
+ user WS_USER
+end
- execute "set alias llog=log --date=local" do
- command "git config --global alias.llog log --date=local"
- user WS_USER
- end
+execute "set alias llog=log --date=local" do
+ command "git config --global alias.llog log --date=local"
+ user WS_USER
+end
- execute "set apply whitespace=nowarn" do
- command "git config --global apply.whitespace nowarn"
- user WS_USER
- end
+execute "set apply whitespace=nowarn" do
+ command "git config --global apply.whitespace nowarn"
+ user WS_USER
+end
- execute "set color branch=auto" do
- command "git config --global color.branch auto"
- user WS_USER
- end
+execute "set color branch=auto" do
+ command "git config --global color.branch auto"
+ user WS_USER
+end
- execute "set color diff=auto" do
- command "git config --global color.diff auto"
- user WS_USER
- end
+execute "set color diff=auto" do
+ command "git config --global color.diff auto"
+ user WS_USER
+end
- execute "set color interactive=auto" do
- command "git config --global color.interactive auto"
- user WS_USER
- end
+execute "set color interactive=auto" do
+ command "git config --global color.interactive auto"
+ user WS_USER
+end
- execute "set color status=auto" do
- command "git config --global color.status auto"
- user WS_USER
- end
+execute "set color status=auto" do
+ command "git config --global color.status auto"
+ user WS_USER
+end
- execute "set color ui=auto" do
- command "git config --global color.ui auto"
- user WS_USER
- end
+execute "set color ui=auto" do
+ command "git config --global color.ui auto"
+ user WS_USER
+end
- execute "set branch autosetupmerge=true" do
- command "git config --global branch.autosetupmerge true"
- user WS_USER
- end
-end
+execute "set branch autosetupmerge=true" do
+ command "git config --global branch.autosetupmerge true"
+ user WS_USER
+end
View
5 recipes/imagemagick.rb
@@ -1,7 +1,6 @@
include_recipe "pivotal_workstation::homebrew"
-run_unless_marker_file_exists("imagemagick") do
- brew_install "imagemagick"
-end
+brew_install "imagemagick"
+
View
10 recipes/inputrc.rb
@@ -1,8 +1,6 @@
inputrc_location = "#{WS_HOME}/.inputrc"
-unless File.exists?(inputrc_location)
- template inputrc_location do
- owner WS_USER
- source "inputrc.erb"
- end
-end
+template inputrc_location do
+ owner WS_USER
+ source "inputrc.erb"
+end
View
3  recipes/linked_project_recipe.rb
@@ -1,3 +0,0 @@
-execute "This recipe is a placeholder that can be overriden in your project cookbook" do
- command "echo 'this command intentionally left blank'"
-end
View
3  recipes/linked_workstation_recipe.rb
@@ -1,3 +0,0 @@
-execute "This recipe is a placeholder that can be overriden in your workstation cookbook" do
- command "echo 'this command intentionally left blank'"
-end
View
15 recipes/osx_turn_on_locate.rb
@@ -1,9 +1,8 @@
-run_unless_marker_file_exists("located_activated") do
- execute "load locate daemon via launchctl" do
- command "launchctl load -w /System/Library/LaunchDaemons/com.apple.locate.plist"
- end
+execute "load locate daemon via launchctl" do
+ command "launchctl load -w /System/Library/LaunchDaemons/com.apple.locate.plist"
+ not_if "launchctl list | grep locate"
+end
- execute "check launchd is running" do
- command "launchctl list | grep locate"
- end
-end
+execute "check launchd is running" do
+ command "launchctl list | grep locate"
+end
View
2  recipes/ssh_copy_id.rb
@@ -1 +1,3 @@
+include_recipe "pivotal_workstation::homebrew"
+
brew_install "ssh-copy-id"
View
22 recipes/text_mate.rb
@@ -1,18 +1,8 @@
include_recipe "pivotal_workstation::user_owns_usr_local"
-run_unless_marker_file_exists("text_mate_1_5_10") do
- execute "download text mate to temp dir" do
- command "curl -o /tmp/textmate.zip http://dl.macromates.com/TextMate_1.5.10_r1623.zip"
- user WS_USER
- end
-
- execute "extract text mate to /Applications" do
- command 'unzip -o textmate.zip -x __MACOSX* -d /Applications/'
- user WS_USER
- end
-
- execute "link textmate" do
- command "ln -s /Applications/TextMate.app/Contents/Resources/mate /usr/local/bin/mate"
- not_if "test -e /usr/local/bin/mate"
- end
-end
+zip_app_install(:app => "textmate", :uri => "http://dl.macromates.com/TextMate_1.5.10_r1631.zip")
+
+execute "link textmate" do
+ command "ln -s /Applications/TextMate.app/Contents/Resources/mate /usr/local/bin/mate"
+ not_if "test -e /usr/local/bin/mate"
+end
View
10 recipes/textmate_set_defaults.rb
@@ -1,6 +1,4 @@
-run_unless_marker_file_exists("textmate_set_defaults_0") do
- execute "set save on losing focus" do
- command "defaults write ~/Library/Preferences/com.macromates.textmate OakSaveAllOnDeactivate -bool TRUE"
- user WS_USER
- end
-end
+execute "set save on losing focus" do
+ command "defaults write ~/Library/Preferences/com.macromates.textmate OakSaveAllOnDeactivate -bool TRUE"
+ user WS_USER
+end
Please sign in to comment.
Something went wrong with that request. Please try again.