vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1

@@ -2,10 +2,10 @@ $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
   FileType       = 'exe'
   SilentArgs     = '/S'
-  File64         = '\\ucs\software\VCarveProMakerspaceEditionV11015_Setup.exe'
-  Checksum64     = '8f7476e8f68f00d07335ffef4369f3dce827ceb236ace1f8211137fb9542ba99'
+  Url64          = '\\ucs\software\VCarveProMakerspaceEditionV11008_Setup.exe'
+  Checksum64     = 'b6f2243d832b87c89382da7df6f309580256572d0beb88189b54bd54d56bf6f7'
   ChecksumType64 = 'sha256'
   ValidExitCodes = @(0, 1223)
 }
 
-Install-ChocolateyInstallPackage @packageArgs
+Install-ChocolateyPackage @packageArgs

vcarve-pro-makerspace-11.0/update.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
-
-file=$(ls tools/VCarveProMakerspaceEditionV110*_Setup.exe)
-version=$(7z e -so $file  ProductInfo.ini | awk -F= '$1=="product_version" { print $2 }')
-major_version=$(awk -F. -v RS='\r\n' '{print $1"."$2}' <<< $version)
-minor_version=$(awk -F. -v RS='\r\n' '{print $3"."$4}' <<< $version)
-checksum=$(sha256sum $file  | awk '{print $1}')
-
-if [ "$major_version" != "11.0" ]
-then
-    echo "Major version update! This probably won't really work well."
-    exit 1
-fi
-
-echo "Current version for ${PWD##*/}: major=$major_version, minor=$minor_version, checksum=$checksum"
-
-sed -i "s|<version>[^<]*</version>|<version>$minor_version</version>|" "${PWD##*/}.nuspec"
-sed -i "/File64/s|[^\\]*$|${file##*/}'|" tools/chocolateyInstall.ps1
-sed -i "/Checksum64/s|=.*|= '$checksum'|" tools/chocolateyInstall.ps1

vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>vcarve-pro-makerspace-11.0</id>
-    <version>1.5</version>
+    <version>0.8</version>
     <title>VCarve Pro Makerspace Edition</title>
     <authors>Vectric Ltd</authors>
     <owners>Adam</owners>
@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="tools/*.ps1" target="tools" />
+    <file src="tools/**" target="tools" />
   </files>
 </package>

vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1

@@ -1,8 +1,10 @@
+$toolsDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
+
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
   FileType       = 'exe'
   SilentArgs     = '/S'
-  File64         = '\\ucs\software\VCarveProTrialEditionV11015_Setup.exe'
+  File64         = Join-Path $toolsDir 'VCarveProTrialEdition_Setup.exe'
   Checksum64     = '1088a6b21d6df5edecc7ac2a67b3866be5faf3c600c561404ebfe448a16bbc31'
   ChecksumType64 = 'sha256'
   ValidExitCodes = @(0, 1223)

vcarve-pro-trial-11.0/update.sh

@@ -4,12 +4,10 @@ cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
 
 wget -N "https://storage.googleapis.com/vectric_public/VCarveProTrialEdition_Setup.exe" --directory-prefix tools/
 
-file=tools/VCarveProTrialEdition_Setup.exe
-version=$(7z e -so $file ProductInfo.ini | awk -F= '$1=="product_version" { print $2 }')
+version=$(7z e -so tools/VCarveProTrialEdition_Setup.exe ProductInfo.ini | awk -F= '$1=="product_version" { print $2 }')
 major_version=$(awk -F. -v RS='\r\n' '{print $1"."$2}' <<< $version)
 minor_version=$(awk -F. -v RS='\r\n' '{print $3"."$4}' <<< $version)
-checksum=$(sha256sum $file | awk '{print $1}')
-versioned_file_name="VCarveProTrialEditionV${major_version/.}${minor_version/.}_Setup.exe"
+checksum=$(sha256sum tools/VCarveProTrialEdition_Setup.exe | awk '{print $1}')
 
 if [ "$major_version" != "11.0" ]
 then
@@ -17,8 +15,7 @@ then
     exit 1
 fi
 
-echo "Current version for ${PWD##*/}: major=$major_version, minor=$minor_version, checksum=$checksum, filename=$versioned_file_name"
+echo "Current version for ${PWD##*/}: major=$major_version, minor=$minor_version, checksum=$checksum"
 
-sed -i "s|<version>[^<]*</version>|<version>$minor_version</version>|" "${PWD##*/}.nuspec"
-sed -i "/File64/s|[^\\]*$|${versioned_file_name}'|" tools/chocolateyInstall.ps1
+sed -i "s|<version>[^<]*</version>|<version>$minor_version</version>|" vcarve-pro-trial-11.0.nuspec
 sed -i "/Checksum64/s|=.*|= '$checksum'|" tools/chocolateyInstall.ps1

vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec

@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="tools/*.ps1" target="tools" />
+    <file src="tools/**" target="tools" />
   </files>
 </package>