need to fix webcamoid 9

riedel · Jun 1, 2023 · 6542981 · 6542981
1 parent 2d24d5e
commit 6542981
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 26 deletions.
diff --git a/webcamoid/tools/chocolateyInstall.ps1 b/webcamoid/tools/chocolateyInstall.ps1
@@ -1,29 +1,15 @@
 $title = $Env:ChocolateyPackageName
-[array]$key = Get-UninstallRegistryKey -SoftwareName "*$title*"
-
-if($key.DisplayName)
-{
-  $packageArgs = @{
-    packageName          = $Env:ChocolateyPackageName
-    fileType             = 'EXE'
-    silentArgs 		 = "--script $Env:ChocolateyPackageFolder/tools/silentInstall.js"
-    file 		 = $key.UninstallString
-    validExitCodes       = 0,1
-  }
-
-  Uninstall-ChocolateyPackage @packageArgs
-}
 
 $packageArgs = @{
   packageName            = $Env:ChocolateyPackageName
   fileType               = 'EXE'
-  url                    = 'https://github.com/webcamoid/webcamoid/releases/download/8.8.0/webcamoid-8.8.0-win32.exe'
-  url64                    = 'https://github.com/webcamoid/webcamoid/releases/download/8.8.0/webcamoid-8.8.0-win64.exe'
-  checksum               = '3e04c3afa7ac33e7f4923b69e1d3d62256a7f29645d98a19537b3d7e2a88c37e'
-  checksum64               = '0979046c5187325772fc73b3cfff7dc9462dc7c243df44db0f4df9c0f2ba8d77'
+  url                    = 'https://github.com/webcamoid/webcamoid/releases/download/9.0.0/webcamoid-installer-windows-9.0.0-win32.exe'
+  url64                    = 'https://github.com/webcamoid/webcamoid/releases/download/9.0.0/webcamoid-installer-windows-9.0.0-win64.exe'
+  checksum               = '945cdbb56636997020c3d9fcc51456796d04f9d383b5b0393abe54208f1c7160'
+  checksum64               = '615d73e343afc031682f877c73558243aba636fab67440afb368cbcef40e1904'
   checksumType           = 'sha256'
-  silentArgs 		 = "--script $Env:ChocolateyPackageFolder/tools/silentInstall.js"
-  validExitCodes         = 0,1
+  silentArgs 		 = "/S"
+  validExitCodes         = 0
 }
 
 Install-ChocolateyPackage @packageArgs

diff --git a/webcamoid/tools/chocolateyUninstall.ps1 b/webcamoid/tools/chocolateyUninstall.ps1
@@ -1,12 +1,12 @@
 $title = $Env:ChocolateyPackageName
-[array]$key = Get-UninstallRegistryKey -SoftwareName "*$title*"
-Write-Debug "using UnInstaller at $key.UninstallString"
+$installLocation = Get-AppInstallLocation $Env:ChocolateyPackageName
+Write-Debug "using UnInstaller at $installLocation"
 
 $packageArgs = @{
   packageName            = $Env:ChocolateyPackageName
   fileType               = 'EXE'
-  silentArgs 		 = "--script $Env:ChocolateyPackageFolder/tools/silentInstall.js"
-  file 			 = $key.UninstallString
+  silentArgs 		 = "/S"
+  file 			 = "$installLocation\uninstall.exe"
   validExitCodes         = @(0)
 }
 

diff --git a/webcamoid/tools/silentInstall.js b/webcamoid/tools/silentInstall.js
diff --git a/webcamoid/update.ps1 b/webcamoid/update.ps1
@@ -32,7 +32,7 @@ function global:au_GetLatest {
         URL32 = ($release.assets | where-object {$_.name -like "*win32.exe" })[0].browser_download_url 
         URL64 = ($release.assets | where-object {$_.name -like "*win64.exe" })[0].browser_download_url 
 	readmeUrl  = $readme.download_url
-        Version = $release.tag_name
+        Version = $release.tag_name+"-update1"
         packageSourceUrl   = 'https://github.com/' + $package_repository
         projectUrl = $repo.homepage 
         projectSourceUrl   = $repo.html_url 

diff --git a/webcamoid/webcamoid.nuspec.in b/webcamoid/webcamoid.nuspec.in
@@ -15,7 +15,7 @@
     <projectUrl>{projectUrl}</projectUrl>
     <bugTrackerUrl>{projectSourceUrl}/issues</bugTrackerUrl>
     <projectSourceUrl>{githubUrl}</projectSourceUrl>
-    <iconUrl>{githubRawUrl}/StandAlone/share/icons/hicolor/scalable/webcamoid.svg</iconUrl>
+    <iconUrl>{githubRawUrl}/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/scalable/webcamoid.svg</iconUrl>
     <docsUrl>{projectSourceUrl}/wiki</docsUrl>
     <!--mailingListUrl></mailingListUrl-->