Bump vcarve-pro-trial-12.0 to 0.9

Use same update script for vcarve pro trial as makerspace edition
Bump vcarve-pro-makerspace-12.0 to 1.0
2024-10-16 15:05:44 -04:00 · 2024-10-16 15:05:22 -04:00 · 2024-10-16 15:03:10 -04:00 · 2024-10-16 15:00:58 -04:00 · 2024-10-16 14:56:07 -04:00
14 changed files with 16 additions and 163 deletions
--- a/vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1
@ -1,11 +0,0 @@
-$packageArgs = @{
-  packageName    = $env:ChocolateyPackageName
-  FileType       = 'exe'
-  SilentArgs     = '/S'
-  File64         = '\\ucs\software\VCarveProMakerspaceEditionV11016_Setup.exe'
-  Checksum64     = '5397227121f62c7f338e68d27f18a3c11d3c5aa54440922c73dbdf6fd9ddc4f5'
-  ChecksumType64 = 'sha256'
-  ValidExitCodes = @(0, 1223)
-}
-
-Install-ChocolateyInstallPackage @packageArgs
--- a/vcarve-pro-makerspace-11.0/tools/chocolateyUninstall.ps1
+++ b/vcarve-pro-makerspace-11.0/tools/chocolateyUninstall.ps1
@ -1,8 +0,0 @@
-$packageArgs = @{
-  PackageName = 'vcarve-pro-makerspace-11.0'
-  FileType    = 'exe'
-  File        = 'C:\Program Files\VCarve Pro - Makerspace Edition 11.0\uninst.exe'
-  SilentArgs  = '/S'
-}
-
-Uninstall-ChocolateyPackage @packageArgs
--- a/vcarve-pro-makerspace-11.0/update.sh
+++ b/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
--- a/vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec
+++ b/vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec
@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <id>vcarve-pro-makerspace-11.0</id>
-    <version>1.6</version>
-    <title>VCarve Pro Makerspace Edition</title>
-    <authors>Vectric Ltd</authors>
-    <owners>Adam</owners>
-    <projectUrl>https://www.vectric.com/products/vcarve-pro</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>VCarve Pro provides a powerful but intuitive software solution for creating and cutting parts on a CNC Router. VCarve Pro gives you the power to produce complex 2D patterns with profile, pocket, drill and inlay toolpaths, plus gives you the ability to create designs with v-carving textures as well as import and machine unlimited Vectric 3D clipart or single model files. The 'Pro' edition gives you unlimited job and toolpath size, true shape nesting and job set-up sheets, ideally suited to a production environment.</description>
-    <summary>CAM software for a CNC router.</summary>
-    <releaseNotes />
-    <copyright>© 2005-2021 Vectric Limited.</copyright>
-    <tags>router cnc shopbot</tags>
-    <dependencies>
-      <dependency id="vcredist2010" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="tools/*.ps1" target="tools" />
-  </files>
-</package>
--- a/vcarve-pro-makerspace-12.0/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-makerspace-12.0/tools/chocolateyInstall.ps1
@ -2,8 +2,8 @@ $packageArgs = @{
  packageName    = $env:ChocolateyPackageName
  FileType       = 'exe'
  SilentArgs     = '/S'
-  File64         = '\\ucs\software\VCarveProMakerspaceEditionV12009_Setup.exe'
-  Checksum64     = '7e87216cf9bfa025eeaaee35f78b8ddaf5444e71098f7780eb8787df871864a3'
+  File64         = '\\ucs\software\VCarveProMakerspaceEditionV12010_Setup.exe'
+  Checksum64     = '666a27e4473eb1b1148daf1b65b893a82aeb61f182b00a0786629ed1604e8d2e'
  ChecksumType64 = 'sha256'
  ValidExitCodes = @(0, 1223)
 }
--- a/vcarve-pro-makerspace-12.0/update.sh
+++ b/vcarve-pro-makerspace-12.0/update.sh
@ -1,12 +1,16 @@
 #!/bin/bash

-cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
+if [ -z "$1" ]
+then
+    echo "Usage: $0 NEW_EXE"
+    exit 1
+fi
+file="$1"

-file=$(ls tools/VCarveProMakerspaceEditionV120*_Setup.exe)
-version=$(7z e -so $file  ProductInfo.ini | awk -F= '$1=="product_version" { print $2 }')
+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}')
+checksum=$(sha256sum $file | awk '{print $1}')

 if [ "$major_version" != "12.0" ]
 then
@ -14,6 +18,7 @@ then
    exit 1
 fi

+cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
 echo "Current version for ${PWD##*/}: major=$major_version, minor=$minor_version, checksum=$checksum"

 sed -i "s|<version>[^<]*</version>|<version>$minor_version</version>|" "${PWD##*/}.nuspec"
--- a/vcarve-pro-makerspace-12.0/vcarve-pro-makerspace-12.0.nuspec
+++ b/vcarve-pro-makerspace-12.0/vcarve-pro-makerspace-12.0.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
  <metadata>
    <id>vcarve-pro-makerspace-12.0</id>
-    <version>0.9</version>
+    <version>1.0</version>
    <title>VCarve Pro Makerspace Edition</title>
    <authors>Vectric Ltd</authors>
    <owners>Adam</owners>
--- a/vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1
@ -1,11 +0,0 @@
-$packageArgs = @{
-  packageName    = $env:ChocolateyPackageName
-  FileType       = 'exe'
-  SilentArgs     = '/S'
-  File64         = '\\ucs\software\VCarveProTrialEditionV11016_Setup.exe'
-  Checksum64     = '86d2f570d4238b1c930021aae52e4f6d63e9d24cad8ade1044369595411cbfa8'
-  ChecksumType64 = 'sha256'
-  ValidExitCodes = @(0, 1223)
-}
-
-Install-ChocolateyInstallPackage @packageArgs
--- a/vcarve-pro-trial-11.0/tools/chocolateyUninstall.ps1
+++ b/vcarve-pro-trial-11.0/tools/chocolateyUninstall.ps1
@ -1,8 +0,0 @@
-$packageArgs = @{
-  PackageName = 'vcarve-pro-trial-11.0'
-  FileType    = 'exe'
-  File        = 'C:\Program Files\VCarve Pro Trial Edition 11.0\uninst.exe'
-  SilentArgs  = '/S'
-}
-
-Uninstall-ChocolateyPackage @packageArgs
--- a/vcarve-pro-trial-11.0/update.sh
+++ b/vcarve-pro-trial-11.0/update.sh
@ -1,24 +0,0 @@
-#!/bin/bash
-
-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 }')
-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"
-
-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, filename=$versioned_file_name"
-
-sed -i "s|<version>[^<]*</version>|<version>$minor_version</version>|" "${PWD##*/}.nuspec"
-sed -i "/File64/s|[^\\]*$|${versioned_file_name}'|" tools/chocolateyInstall.ps1
-sed -i "/Checksum64/s|=.*|= '$checksum'|" tools/chocolateyInstall.ps1
--- a/vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec
+++ b/vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec
@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <id>vcarve-pro-trial-11.0</id>
-    <version>1.6</version>
-    <title>VCarve Pro Trial</title>
-    <authors>Vectric Ltd</authors>
-    <owners>Adam</owners>
-    <projectUrl>https://www.vectric.com/products/vcarve-pro</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>VCarve Pro provides a powerful but intuitive software solution for creating and cutting parts on a CNC Router. VCarve Pro gives you the power to produce complex 2D patterns with profile, pocket, drill and inlay toolpaths, plus gives you the ability to create designs with v-carving textures as well as import and machine unlimited Vectric 3D clipart or single model files. The 'Pro' edition gives you unlimited job and toolpath size, true shape nesting and job set-up sheets, ideally suited to a production environment.</description>
-    <summary>CAM software for a CNC router.</summary>
-    <releaseNotes />
-    <copyright>© 2005-2021 Vectric Limited.</copyright>
-    <tags>router cnc shopbot</tags>
-    <dependencies>
-      <dependency id="vcredist2010" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="tools/*.ps1" target="tools" />
-  </files>
-</package>
--- a/vcarve-pro-trial-12.0/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-trial-12.0/tools/chocolateyInstall.ps1
@ -2,8 +2,8 @@ $packageArgs = @{
  packageName    = $env:ChocolateyPackageName
  FileType       = 'exe'
  SilentArgs     = '/S'
-  File64         = '\\ucs\software\VCarveProTrialEditionV12007_Setup.exe'
-  Checksum64     = '2cb9f3d08699c425daa41d7441fc01272179885b16b4634d71195011a9d6bc0c'
+  File64         = '\\ucs\software\VCarveProTrialEdition_Setup.exe'
+  Checksum64     = '68c3196ff64df42929a5b237d939cc0f45fad7c5c9c1d28c77b8a89a622298cb'
  ChecksumType64 = 'sha256'
  ValidExitCodes = @(0, 1223)
 }
--- a/vcarve-pro-trial-12.0/update.sh
+++ b/vcarve-pro-trial-12.0/update.sh
@ -1,24 +0,0 @@
-#!/bin/bash
-
-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 }')
-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"
-
-if [ "$major_version" != "12.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, filename=$versioned_file_name"
-
-sed -i "s|<version>[^<]*</version>|<version>$minor_version</version>|" "${PWD##*/}.nuspec"
-sed -i "/File64/s|[^\\]*$|${versioned_file_name}'|" tools/chocolateyInstall.ps1
-sed -i "/Checksum64/s|=.*|= '$checksum'|" tools/chocolateyInstall.ps1
--- a/vcarve-pro-trial-12.0/update.sh
+++ b/vcarve-pro-trial-12.0/update.sh
@ -0,0 +1 @@
+../vcarve-pro-makerspace-12.0/update.sh
--- a/vcarve-pro-trial-12.0/vcarve-pro-trial-12.0.nuspec
+++ b/vcarve-pro-trial-12.0/vcarve-pro-trial-12.0.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
  <metadata>
    <id>vcarve-pro-trial-12.0</id>
-    <version>0.7</version>
+    <version>0.9</version>
    <title>VCarve Pro Trial</title>
    <authors>Vectric Ltd</authors>
    <owners>Adam</owners>
Author	SHA1	Message	Date
Adam Goldsmith	91c8a4d61b	Bump vcarve-pro-trial-12.0 to 0.9 All checks were successful / Build-Chocolatey-Packages (push) Successful in 1m35s Details	2024-10-16 15:05:44 -04:00
Adam Goldsmith	3457cf3b45	Use same update script for vcarve pro trial as makerspace edition	2024-10-16 15:05:22 -04:00
Adam Goldsmith	48d99806b5	Bump vcarve-pro-makerspace-12.0 to 1.0	2024-10-16 15:03:10 -04:00
Adam Goldsmith	65ae1717ce	Take new exe file as arg in vcarve-pro-makerspace-12.0/update.sh	2024-10-16 15:00:58 -04:00
Adam Goldsmith	ca58cdd42e	Remove VCarve Pro 11.0	2024-10-16 14:56:07 -04:00