From 1b7703607d71ddfaef6a15a8ca5f5c67af81625b Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 25 Mar 2015 16:50:24 +0100 Subject: [PATCH 1/2] Update chocolatey.me Getting version with powershell and uncommenting startufile --- chocolatey/chocolatey.me | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/chocolatey/chocolatey.me b/chocolatey/chocolatey.me index b500bf4..3734728 100644 --- a/chocolatey/chocolatey.me +++ b/chocolatey/chocolatey.me @@ -10,7 +10,7 @@ ################################### from microsoft/dotnet:4.0.3 -using python/python:3.4.1 + ################################### # Download and install @@ -27,16 +27,12 @@ batch chocolatey update -y echo 1 -cmd chocolatey > output.txt & echo 1 - -batch - echo import re >> getVersion.py - echo f = open('output.txt', 'r') >> getVersion.py - echo print(re.findall('Chocolatey v(\d*\.\d*\.\d*\.\d*)', f.read() )[0]) >> getVersion.py - -cmd python getVersion.py +#Get version number +cmd "echo (Get-Item ""c:\ProgramData\chocolatey\choco.exe"").VersionInfo.ProductVersion >> GetVersion.ps1" +cmd "powershell -executionpolicy remotesigned -File ""GetVersion.ps1"" " var version = $out + ################################### # Environment Variables ################################### @@ -51,7 +47,6 @@ var version = $out workdir c:\ cmd rmdir c:\Workspace /s /q -cmd rmdir C:\python34 /s /q ################################### @@ -68,4 +63,4 @@ meta tag=$version # Startup File ################################### -# startup file ("cmd","/k echo Chocolatey version: ", $version) \ No newline at end of file +startup file ("cmd","/k echo Chocolatey version: " + $version) From 97ce95a8f6e8c9bcfb02bfb32821f02a6ac4166c Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 25 Mar 2015 16:54:54 +0100 Subject: [PATCH 2/2] Update chocolatey.me --- chocolatey/chocolatey.me | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chocolatey/chocolatey.me b/chocolatey/chocolatey.me index 3734728..9961786 100644 --- a/chocolatey/chocolatey.me +++ b/chocolatey/chocolatey.me @@ -63,4 +63,4 @@ meta tag=$version # Startup File ################################### -startup file ("cmd","/k echo Chocolatey version: " + $version) +startup file ("cmd","/k echo Chocolatey version: ", $version)