diff --git a/bootstrap.ps1 b/bootstrap.ps1 index 839f28a..afef7f3 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -12,7 +12,7 @@ If(!(Test-Path 'C:/opscode/chefdk/bin/chef')) { $KITCHEN_DATA = "${env:TEMP}/kitchen/data" # Install workup -C:/opscode/chefdk/bin/chef gem install "${KITCHEN_DATA}/pkg/workup-0.1.2.gem" +C:/opscode/chefdk/bin/chef gem install "${KITCHEN_DATA}/pkg/workup-0.1.3.gem" # Make a policyfile to test git If(!(Test-Path -Path '~/.workup')){ New-Item '~/.workup' -Type Directory } diff --git a/bootstrap.sh b/bootstrap.sh index 8e7843b..9cd5813 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -45,7 +45,7 @@ else fi # Install workup -/opt/chefdk/bin/chef gem install /tmp/kitchen/data/pkg/workup-0.1.2.gem -V +/opt/chefdk/bin/chef gem install /tmp/kitchen/data/pkg/workup-0.1.3.gem -V # Make a policyfile to test git mkdir -p ~/.workup diff --git a/install.ps1 b/install.ps1 index 1957274..c88e662 100644 --- a/install.ps1 +++ b/install.ps1 @@ -28,7 +28,7 @@ Function Add-ToPath { Write-Host 'Bootstrapping Workup' -$WORKUP_VERSION = "0.1.2" +$WORKUP_VERSION = "0.1.3" $WORKUP_URL = "https://github.com/cvent/workup/releases/download/v${WORKUP_VERSION}/workup.msi" $WORKUP_DIR = Join-Path ${HOME} '.workup' diff --git a/install.sh b/install.sh index 6b78a2d..ecc6832 100755 --- a/install.sh +++ b/install.sh @@ -22,7 +22,7 @@ echo_error() { echo 'Bootstrapping Workup' -WORKUP_VERSION="0.1.2" +WORKUP_VERSION="0.1.3" WORKUP_URL="https://github.com/cvent/workup/releases/download/v${WORKUP_VERSION}/workup.pkg" WORKUP_DIR="${HOME}/.workup" diff --git a/lib/workup/version.rb b/lib/workup/version.rb index 9835974..02a8ddf 100644 --- a/lib/workup/version.rb +++ b/lib/workup/version.rb @@ -17,5 +17,5 @@ # module Workup - VERSION = '0.1.2' + VERSION = '0.1.3' end diff --git a/omnibus/config/projects/workup.rb b/omnibus/config/projects/workup.rb index ccc09d2..4ac5798 100644 --- a/omnibus/config/projects/workup.rb +++ b/omnibus/config/projects/workup.rb @@ -13,7 +13,7 @@ # and /opt/workup on all other platforms install_dir "#{default_root}/#{name}" -build_version '0.1.2' +build_version '0.1.3' build_iteration 1 diff --git a/omnibus/config/software/workup.rb b/omnibus/config/software/workup.rb index 04785c5..862d3a8 100644 --- a/omnibus/config/software/workup.rb +++ b/omnibus/config/software/workup.rb @@ -57,7 +57,7 @@ build do env = with_standard_compiler_flags(with_embedded_path) - gem 'install pkg/workup-0.1.2.gem', env: env + gem 'install pkg/workup-0.1.3.gem', env: env block do ['workup', 'git'].each do |cmd| diff --git a/omnibus/workup_build/recipes/default.rb b/omnibus/workup_build/recipes/default.rb index 5278773..d060691 100644 --- a/omnibus/workup_build/recipes/default.rb +++ b/omnibus/workup_build/recipes/default.rb @@ -57,13 +57,9 @@ code "cmd /c start '' /wait msiexec /i (ls /vagrant/code/workup/omnibus/pkg/*.msi | select -last 1).FullName /qn" end - execute 'create Policyfile_git' do - command 'robocopy /vagrant/code/workup/files/Policyfile.rb /Users/vagrant/.workup/Policyfile_git.rb' - returns [0, 1, 2, 3] - end - - powershell_script 'Make Policyfile use git' do + powershell_script 'Create and modify Policyfile_git' do code <<-EOH + Copy-Item /vagrant/code/workup/files/Policyfile.rb /Users/vagrant/.workup/Policyfile_git.rb Add-Content '~/.workup/Policyfile_git.rb' "cookbook 'nop', github: 'sczizzo/Archive', rel: 'nop-cookbook'" EOH end