From 98f41c556bc1a8817f72c0242da259627674c51d Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Sun, 31 Jul 2022 16:48:40 -0400
Subject: [PATCH] VCarve Pro 11.0: Don't include installers, they are too big

---
 vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1       | 4 +---
 vcarve-pro-makerspace-11.0/update.sh                         | 2 +-
 vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec | 2 +-
 vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1            | 4 +---
 vcarve-pro-trial-11.0/update.sh                              | 4 +++-
 vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec           | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1 b/vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1
index 4e96674..43166fa 100644
--- a/vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-makerspace-11.0/tools/chocolateyInstall.ps1
@@ -1,10 +1,8 @@
-$toolsDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
-
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
   FileType       = 'exe'
   SilentArgs     = '/S'
-  File64         = Join-Path $toolsDir 'VCarveProMakerspaceEditionV11008_Setup.exe'
+  File64         = '\\ucs\software\VCarveProMakerspaceEditionV11015_Setup.exe'
   Checksum64     = '8f7476e8f68f00d07335ffef4369f3dce827ceb236ace1f8211137fb9542ba99'
   ChecksumType64 = 'sha256'
   ValidExitCodes = @(0, 1223)
diff --git a/vcarve-pro-makerspace-11.0/update.sh b/vcarve-pro-makerspace-11.0/update.sh
index 200bae7..9eb1a54 100755
--- a/vcarve-pro-makerspace-11.0/update.sh
+++ b/vcarve-pro-makerspace-11.0/update.sh
@@ -16,6 +16,6 @@ fi
 
 echo "Current version for ${PWD##*/}: major=$major_version, minor=$minor_version, checksum=$checksum"
 
-sed -i "/File64/s|'[^']*$|'${file##*/}'|" "${PWD##*/}.nuspec"
 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
diff --git a/vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec b/vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec
index e636c5a..19f78b5 100644
--- a/vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec
+++ b/vcarve-pro-makerspace-11.0/vcarve-pro-makerspace-11.0.nuspec
@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="tools/**" target="tools" />
+    <file src="tools/*.ps1" target="tools" />
   </files>
 </package>
diff --git a/vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1 b/vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1
index 3347782..7a4df68 100644
--- a/vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-trial-11.0/tools/chocolateyInstall.ps1
@@ -1,10 +1,8 @@
-$toolsDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
-
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
   FileType       = 'exe'
   SilentArgs     = '/S'
-  File64         = Join-Path $toolsDir 'VCarveProTrialEdition_Setup.exe'
+  File64         = '\\ucs\software\VCarveProTrialEditionV11015_Setup.exe'
   Checksum64     = '1088a6b21d6df5edecc7ac2a67b3866be5faf3c600c561404ebfe448a16bbc31'
   ChecksumType64 = 'sha256'
   ValidExitCodes = @(0, 1223)
diff --git a/vcarve-pro-trial-11.0/update.sh b/vcarve-pro-trial-11.0/update.sh
index c64f19e..7bed890 100755
--- a/vcarve-pro-trial-11.0/update.sh
+++ b/vcarve-pro-trial-11.0/update.sh
@@ -9,6 +9,7 @@ version=$(7z e -so $file ProductInfo.ini | awk -F= '$1=="product_version" { prin
 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
@@ -16,7 +17,8 @@ then
     exit 1
 fi
 
-echo "Current version for ${PWD##*/}: major=$major_version, minor=$minor_version, checksum=$checksum"
+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
diff --git a/vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec b/vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec
index 836f75b..a693df3 100644
--- a/vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec
+++ b/vcarve-pro-trial-11.0/vcarve-pro-trial-11.0.nuspec
@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="tools/**" target="tools" />
+    <file src="tools/*.ps1" target="tools" />
   </files>
 </package>