Bump choco scripts version

Change build script to first build none steam version
then publish to kelteseth.com. Follow with regular steam build

Tools/Installer/package.xml

@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>ScreenPlay</DisplayName>
     <Description>ScreenPlay is an Open Source cross-platform app for displaying Video Wallpaper & Widgets.</Description>
-    <Version>0.15.0</Version>
+    <Version>0.15.0-RC3</Version>
-    <ReleaseDate>2022-01-01</ReleaseDate>
+    <ReleaseDate>2022-11-02</ReleaseDate>
     <Default>true</Default>
     <Script>installscript.qs</Script>
 </Package>

Tools/Scoop/ScreenPlay.json

@@ -1,9 +1,9 @@
 {
-    "version": "0.15.0-RC2",
+    "version": "0.15.0-RC3",
     "description": "ScreenPlay is an Open Source Live-Wallpaper app for Windows and OSX. ",
     "homepage": "https://screen-play.app/",
     "url": "https://kelteseth.com/releases/$version/ScreenPlay-$version-x64-windows-release.zip",
-    "hash": "37e36c9e1d3e0d4e95ea40a869f3e840787b6b5bb889a798b8e1aec5252e6ee5",
+    "hash": "278f86a888810bab63af17309dd153a59eae35831232cd813c93e3ddb4e32b99",
     "bin": "ScreenPlay.exe",
     "license": "AGPL-3.0",
     "extract_dir": "bin",

Tools/build_and_publish.py

@@ -79,34 +79,36 @@ if __name__ == "__main__":
         sys.exit(0)
 
     if platform.system() == "Windows":
-        # Steamless version first
         build_config.build_architecture = "x64"
-        build_config.build_steam = "OFF"
+        
-        build_result = build.execute(build_config)
+        if not args.skip_publish:
+            # Steamless version first
+            build_config.build_steam = "OFF"
+            build_result = build.execute(build_config)
+            ssh = paramiko.SSHClient() 
+            ssh.load_system_host_keys()
+            ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+            ssh.connect('kelteseth.com', username=args.hosting_username, password=args.hosting_password)
+            sftp = ssh.open_sftp()
+            release_folder = "/kelteseth_com/public/releases/" + build_config.screenplay_version + "/"
+            if sftp_exists(sftp,release_folder):
+                remoteFiles = sftp.listdir(path=release_folder)
+                for file in remoteFiles:
+                    print(f"Delte old: {release_folder+file}")
+                    sftp.remove(release_folder+file)
+            else:
+                sftp.mkdir(release_folder)
+            print("Uploading files...")
 
-        ssh = paramiko.SSHClient() 
+            sftp.put(build_result.build_zip,    release_folder + str(build_result.build_zip.name))
-        ssh.load_system_host_keys()
+            sftp.put(build_result.installer,    release_folder + str(build_result.installer.name))
-        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+            sftp.put(build_result.installer_zip,release_folder + str(build_result.installer_zip.name))
-        ssh.connect('kelteseth.com', username=args.hosting_username, password=args.hosting_password)
+            sftp.put(build_result.build_hash,   release_folder + str(build_result.build_hash.name))
-        sftp = ssh.open_sftp()
+            sftp.close()
-        release_folder = "/kelteseth_com/public/releases/" + build_config.screenplay_version + "/"
+            ssh.close()
-        if sftp_exists(sftp,release_folder):
-            remoteFiles = sftp.listdir(path=release_folder)
-            for file in remoteFiles:
-                print(f"Delte old: {release_folder+file}")
-                sftp.remove(release_folder+file)
-        else:
-            sftp.mkdir(release_folder)
-        print("Uploading files...")
-
-        sftp.put(build_result.build_zip,    release_folder + str(build_result.build_zip.name))
-        sftp.put(build_result.installer,    release_folder + str(build_result.installer.name))
-        sftp.put(build_result.installer_zip,release_folder + str(build_result.installer_zip.name))
-        sftp.put(build_result.build_hash,   release_folder + str(build_result.build_hash.name))
-        sftp.close()
-        ssh.close()
 
         # Now build the steam version
+        os.chdir(tools_path)
         build_config.build_steam = "ON"
         build_config.create_installer = "OFF"
         build_result = build.execute(build_config)

Tools/chocolatey/ScreenPlay/ReadMe.md

@@ -7,7 +7,7 @@ choco pack
 
 Install the generated nupkg:
 ```
-choco install screenplay.0.15.0-RC2.nupkg -dv -s .  
+choco install screenplay.0.15.0-RC3.nupkg -dv -s .  
 ```
 
 Set api key from [https://community.chocolatey.org/account](https://community.chocolatey.org/account):
@@ -17,5 +17,5 @@ choco apikey --key AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAA --source https://push.chocol
 
 Psuh:
 ```
-choco push screenplay.0.15.0-RC2.nupkg --source https://push.chocolatey.org/
+choco push screenplay.0.15.0-RC3.nupkg --source https://push.chocolatey.org/
 ```

Tools/chocolatey/ScreenPlay/tools/chocolateyinstall.ps1

@@ -2,7 +2,7 @@
 $ErrorActionPreference = 'Stop';
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 $url        = ''
-$url64      = 'https://kelteseth.com/releases/0.15.0-RC2/ScreenPlay-0.15.0-RC2-x64-windows-release.zip' 
+$url64      = 'https://kelteseth.com/releases/0.15.0-RC3/ScreenPlay-0.15.0-RC3-x64-windows-release.zip' 
 
 $packageArgs = @{
   packageName   = $env:ChocolateyPackageName
@@ -14,7 +14,7 @@ $packageArgs = @{
   softwareName  = 'ScreenPlay*'
   checksum      = ''
   checksumType  = 'sha256'
-  checksum64    = '0502e549ff4f10ec8b9090eb1fc35a9fe6297ea64f435aaefd87a77e5f70190f'
+  checksum64    = '278f86a888810bab63af17309dd153a59eae35831232cd813c93e3ddb4e32b99'
   checksumType64= 'sha256'
 }