diff --git a/assets/package/chocolatey/oto.nuspec b/assets/package/chocolatey/oto.nuspec index 8208fca..c86e855 100644 --- a/assets/package/chocolatey/oto.nuspec +++ b/assets/package/chocolatey/oto.nuspec @@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe - __REPLACE__ + 0.0.282 @@ -35,9 +35,9 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe oto (Install) - __REPLACE_AUTHORS_OF_SOFTWARE_COMMA_SEPARATED__ + toki - https://_Software_Location_REMOVE_OR_FILL_OUT_ + https://toki-labs.com/oto @@ -49,9 +49,9 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe - oto SPACE_SEPARATED - __REPLACE__ - __REPLACE__MarkDown_Okay + oto + Automation tool + Automation tool for multi platforms diff --git a/assets/package/chocolatey/tools/chocolateybeforemodify.ps1 b/assets/package/chocolatey/tools/chocolateybeforemodify.ps1 index eadc55f..949796e 100644 --- a/assets/package/chocolatey/tools/chocolateybeforemodify.ps1 +++ b/assets/package/chocolatey/tools/chocolateybeforemodify.ps1 @@ -7,3 +7,10 @@ # NOTE: For upgrades - like the uninstall script, this script always runs from # the currently installed version, not from the new upgraded package version. +# Chocolatey package arguments +$installPath = Join-Path $env:LOCALAPPDATA "com.toki-labs.oto" +$otoExePath = Join-Path $installPath "oto.exe" + +# Step 1: Execute 'oto scheduler -t cli' +Write-Host "Executing 'oto scheduler -t'..." +& $otoExePath scheduler -t \ No newline at end of file diff --git a/assets/package/chocolatey/tools/chocolateyinstall.ps1 b/assets/package/chocolatey/tools/chocolateyinstall.ps1 index fe48883..c5b5714 100644 --- a/assets/package/chocolatey/tools/chocolateyinstall.ps1 +++ b/assets/package/chocolatey/tools/chocolateyinstall.ps1 @@ -1,139 +1,57 @@ -# IMPORTANT: Before releasing this package, copy/paste the next 2 lines into PowerShell to remove all comments from this file: -# $f='c:\path\to\thisFile.ps1' -# gc $f | ? {$_ -notmatch "^\s*#"} | % {$_ -replace '(^.*?)\s*?[^``]#.*','$1'} | Out-File $f+".~" -en utf8; mv -fo $f+".~" $f - -# 1. See the _TODO.md that is generated top level and read through that -# 2. Follow the documentation below to learn how to create a package for the package type you are creating. -# 3. In Chocolatey scripts, ALWAYS use absolute paths - $toolsDir gets you to the package's tools directory. -$ErrorActionPreference = 'Stop' # stop on all errors -$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" -# Internal packages (organizations) or software that has redistribution rights (community repo) -# - Use `Install-ChocolateyInstallPackage` instead of `Install-ChocolateyPackage` -# and put the binaries directly into the tools folder (we call it embedding) -#$fileLocation = Join-Path $toolsDir 'NAME_OF_EMBEDDED_INSTALLER_FILE' -# If embedding binaries increase total nupkg size to over 1GB, use share location or download from urls -#$fileLocation = '\\SHARE_LOCATION\to\INSTALLER_FILE' -# Community Repo: Use official urls for non-redist binaries or redist where total package size is over 200MB -# Internal/Organization: Download from internal location (internet sources are unreliable) -$url = '' # download url, HTTPS preferred -$url64 = '' # 64bit URL here (HTTPS preferred) or remove - if installer contains both (very rare), use $url +$ErrorActionPreference = 'Stop' # Stop on all errors +# Define the package arguments $packageArgs = @{ - packageName = $env:ChocolateyPackageName - unzipLocation = $toolsDir - fileType = 'EXE_MSI_OR_MSU' #only one of these: exe, msi, msu - url = $url - url64bit = $url64 - #file = $fileLocation - - softwareName = 'oto*' #part or all of the Display Name as you see it in Programs and Features. It should be enough to be unique - - # Checksums are required for packages which will be hosted on the Chocolatey Community Repository. - # To determine checksums, you can get that from the original site if provided. - # You can also use checksum.exe (choco install checksum) and use it - # e.g. checksum -t sha256 -f path\to\file - checksum = '' - checksumType = 'sha256' #default is md5, can also be sha1, sha256 or sha512 - checksum64 = '' - checksumType64= 'sha256' #default is checksumType - - # MSI - silentArgs = "/qn /norestart /l*v `"$($env:TEMP)\$($packageName).$($env:chocolateyPackageVersion).MsiInstall.log`"" # ALLUSERS=1 DISABLEDESKTOPSHORTCUT=1 ADDDESKTOPICON=0 ADDSTARTMENU=0 - validExitCodes= @(0, 3010, 1641) - # OTHERS - # Uncomment matching EXE type (sorted by most to least common) - #silentArgs = '/S' # NSIS - #silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-' # Inno Setup - #silentArgs = '/s' # InstallShield - #silentArgs = '/s /v"/qn"' # InstallShield with MSI - #silentArgs = '/s' # Wise InstallMaster - #silentArgs = '-s' # Squirrel - #silentArgs = '-q' # Install4j - #silentArgs = '-s' # Ghost - # Note that some installers, in addition to the silentArgs above, may also need assistance of AHK to achieve silence. - #silentArgs = '' # none; make silent with input macro script like AutoHotKey (AHK) - # https://community.chocolatey.org/packages/autohotkey.portable - #validExitCodes= @(0) #please insert other valid exit codes here + packageName = $env:ChocolateyPackageName + unzipLocation = Join-Path $env:LOCALAPPDATA 'com.toki-labs.oto' + url = 'http://toki-labs.com/cdn/oto/windows/oto_x64_v0.0.281.zip' + url64bit = 'http://toki-labs.com/cdn/oto/windows/oto_x64_v0.0.281.zip' + checksum = '' # Optional: Provide checksum if available + checksumType = 'sha256' # Adjust if checksum is provided + validExitCodes= @(0) # Only exit code 0 is considered valid } -Install-ChocolateyPackage @packageArgs # https://docs.chocolatey.org/en-us/create/functions/install-chocolateypackage -#Install-ChocolateyZipPackage @packageArgs # https://docs.chocolatey.org/en-us/create/functions/install-chocolateyzippackage -## If you are making your own internal packages (organizations), you can embed the installer or -## put on internal file share and use the following instead (you'll need to add $file to the above) -#Install-ChocolateyInstallPackage @packageArgs # https://docs.chocolatey.org/en-us/create/functions/install-chocolateyinstallpackage +# Ensure the destination folder exists +if (-Not (Test-Path -Path $packageArgs.unzipLocation)) { + New-Item -ItemType Directory -Path $packageArgs.unzipLocation -Force | Out-Null +} -## Main helper functions - these have error handling tucked into them already -## see https://docs.chocolatey.org/en-us/create/functions +# Use Chocolatey helper function to download and unzip the file +Install-ChocolateyZipPackage ` + $packageArgs.packageName ` + $packageArgs.url ` + $packageArgs.unzipLocation ` + -url64 $packageArgs.url64bit ` + -checksum $packageArgs.checksum ` + -checksumType $packageArgs.checksumType -## Install an application, will assert administrative rights -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateypackage -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyinstallpackage -## add additional optional arguments as necessary -##Install-ChocolateyPackage $packageName $fileType $silentArgs $url [$url64 -validExitCodes $validExitCodes -checksum $checksum -checksumType $checksumType -checksum64 $checksum64 -checksumType64 $checksumType64] +# Add the oto.exe to the PATH environment variable +$otoPath = $packageArgs.unzipLocation +if (Test-Path -Path $otoPath) { + Write-Host "Adding $otoPath to the PATH environment variable..." + $currentPath = [System.Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::User) + if (-Not ($currentPath -split ';' | ForEach-Object { $_.Trim() } | Where-Object { $_ -ieq $otoPath })) { + [System.Environment]::SetEnvironmentVariable('Path', "$currentPath;$otoPath", [System.EnvironmentVariableTarget]::User) + Write-Host "oto.exe has been added to the PATH." + } else { + Write-Host "oto.exe is already in the PATH." + } +} else { + Write-Host "Error: oto.exe not found in $packageArgs.unzipLocation." +} -## Download and unpack a zip file - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyzippackage -##Install-ChocolateyZipPackage $packageName $url $toolsDir [$url64 -checksum $checksum -checksumType $checksumType -checksum64 $checksum64 -checksumType64 $checksumType64] +# Step 3: Execute startup script if it exists +$startupScriptPath = Join-Path $env:LOCALAPPDATA "com.toki-labs.oto/startup/com.toki-labs.oto.ps1" +if (Test-Path $startupScriptPath) { + Write-Host "Found startup script at $startupScriptPath. Executing..." + try { + & $startupScriptPath + Write-Host "Successfully executed $startupScriptPath." + } catch { + Write-Host "Error executing $startupScriptPath : $_" + } +} else { + Write-Host "Startup script not found at $startupScriptPath. Skipping execution." +} -## Install Visual Studio Package - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyvsixpackage -#Install-ChocolateyVsixPackage $packageName $url [$vsVersion] [-checksum $checksum -checksumType $checksumType] -#Install-ChocolateyVsixPackage @packageArgs - -## see the full list at https://docs.chocolatey.org/en-us/create/functions - -## downloader that the main helpers use to download items -## if removing $url64, please remove from here -## - https://docs.chocolatey.org/en-us/create/functions/get-chocolateywebfile -#Get-ChocolateyWebFile $packageName 'DOWNLOAD_TO_FILE_FULL_PATH' $url $url64 - -## Installer, will assert administrative rights - used by Install-ChocolateyPackage -## use this for embedding installers in the package when not going to community feed or when you have distribution rights -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyinstallpackage -#Install-ChocolateyInstallPackage $packageName $fileType $silentArgs '_FULLFILEPATH_' -validExitCodes $validExitCodes - -## Unzips a file to the specified location - auto overwrites existing content -## - https://docs.chocolatey.org/en-us/create/functions/get-chocolateyunzip -#Get-ChocolateyUnzip "FULL_LOCATION_TO_ZIP.zip" $toolsDir - -## Runs processes asserting UAC, will assert administrative rights - used by Install-ChocolateyInstallPackage -## - https://docs.chocolatey.org/en-us/create/functions/start-chocolateyprocessasadmin -#Start-ChocolateyProcessAsAdmin 'STATEMENTS_TO_RUN' 'Optional_Application_If_Not_PowerShell' -validExitCodes $validExitCodes - -## To avoid quoting issues, you can also assemble your -Statements in another variable and pass it in -#$appPath = "$env:ProgramFiles\appname" -##Will resolve to C:\Program Files\appname -#$statementsToRun = "/C `"$appPath\bin\installservice.bat`"" -#Start-ChocolateyProcessAsAdmin $statementsToRun cmd -validExitCodes $validExitCodes - -## add specific folders to the path - any executables found in the chocolatey package -## folder will already be on the path. This is used in addition to that or for cases -## when a native installer doesn't add things to the path. -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateypath -#Install-ChocolateyPath 'LOCATION_TO_ADD_TO_PATH' 'User_OR_Machine' # Machine will assert administrative rights - -## Add specific files as shortcuts to the desktop -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyshortcut -#$target = Join-Path $toolsDir "$($packageName).exe" -# Install-ChocolateyShortcut -shortcutFilePath "" -targetPath "" [-workingDirectory "C:\" -arguments "C:\test.txt" -iconLocation "C:\test.ico" -description "This is the description"] - -## Outputs the bitness of the OS (either "32" or "64") -## - https://docs.chocolatey.org/en-us/create/functions/get-osarchitecturewidth -#$osBitness = Get-ProcessorBits - -## Set persistent Environment variables -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyenvironmentvariable -#Install-ChocolateyEnvironmentVariable -variableName "SOMEVAR" -variableValue "value" [-variableType = 'Machine' #Defaults to 'User'] - -## Set up a file association -## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyfileassociation -#Install-ChocolateyFileAssociation - -## Adding a shim when not automatically found - Chocolatey automatically shims exe files found in package directory. -## - https://docs.chocolatey.org/en-us/create/functions/install-binfile -## - https://docs.chocolatey.org/en-us/create/create-packages#how-do-i-exclude-executables-from-getting-shims -#Install-BinFile - -##PORTABLE EXAMPLE -#$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" -# despite the name "Install-ChocolateyZipPackage" this also works with 7z archives -#Install-ChocolateyZipPackage $packageName $url $toolsDir $url64 -## END PORTABLE EXAMPLE +Write-Host "Installation completed successfully!" diff --git a/assets/package/chocolatey/tools/chocolateyuninstall.ps1 b/assets/package/chocolatey/tools/chocolateyuninstall.ps1 index b037bb2..d4c97dd 100644 --- a/assets/package/chocolatey/tools/chocolateyuninstall.ps1 +++ b/assets/package/chocolatey/tools/chocolateyuninstall.ps1 @@ -1,78 +1,32 @@ -# IMPORTANT: Before releasing this package, copy/paste the next 2 lines into PowerShell to remove all comments from this file: -# $f='c:\path\to\thisFile.ps1' -# gc $f | ? {$_ -notmatch "^\s*#"} | % {$_ -replace '(^.*?)\s*?[^``]#.*','$1'} | Out-File $f+".~" -en utf8; mv -fo $f+".~" $f +$ErrorActionPreference = 'Stop' -## NOTE: In 80-90% of the cases (95% with licensed versions due to Package Synchronizer and other enhancements), -## AutoUninstaller should be able to detect and handle registry uninstalls without a chocolateyUninstall.ps1. -## See https://docs.chocolatey.org/en-us/choco/commands/uninstall -## and https://docs.chocolatey.org/en-us/create/functions/uninstall-chocolateypackage +# Custom uninstallation steps +Write-Host "Starting custom uninstallation steps for $env:ChocolateyPackageName..." -## If this is an MSI, ensure 'softwareName' is appropriate, then clean up comments and you are done. -## If this is an exe, change fileType, silentArgs, and validExitCodes +# Step 1: Delete the installed 'oto.exe' file +$installPath = Join-Path $env:LOCALAPPDATA "com.toki-labs.oto" +$otoExePath = Join-Path $installPath "oto.exe" -$ErrorActionPreference = 'Stop' # stop on all errors -$packageArgs = @{ - packageName = $env:ChocolateyPackageName - softwareName = 'oto*' #part or all of the Display Name as you see it in Programs and Features. It should be enough to be unique - fileType = 'EXE_MSI_OR_MSU' #only one of these: MSI or EXE (ignore MSU for now) - # MSI - silentArgs = "/qn /norestart" - validExitCodes= @(0, 3010, 1605, 1614, 1641) # https://msdn.microsoft.com/en-us/library/aa376931(v=vs.85).aspx - # OTHERS - # Uncomment matching EXE type (sorted by most to least common) - #silentArgs = '/S' # NSIS - #silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-' # Inno Setup - #silentArgs = '/s' # InstallShield - #silentArgs = '/s /v"/qn"' # InstallShield with MSI - #silentArgs = '/s' # Wise InstallMaster - #silentArgs = '-s' # Squirrel - #silentArgs = '-q' # Install4j - #silentArgs = '-s -u' # Ghost - # Note that some installers, in addition to the silentArgs above, may also need assistance of AHK to achieve silence. - #silentArgs = '' # none; make silent with input macro script like AutoHotKey (AHK) - # https://community.chocolatey.org/packages/autohotkey.portable - #validExitCodes= @(0) #please insert other valid exit codes here +if (Test-Path $otoExePath) { + Write-Host "Deleting $otoExePath..." + Remove-Item -Path $otoExePath -Force + Write-Host "File $otoExePath deleted." +} else { + Write-Host "File $otoExePath not found. Skipping deletion." } -[array]$key = Get-UninstallRegistryKey -SoftwareName $packageArgs['softwareName'] - -if ($key.Count -eq 1) { - $key | % { - $packageArgs['file'] = "$($_.UninstallString)" #NOTE: You may need to split this if it contains spaces, see below - - if ($packageArgs['fileType'] -eq 'MSI') { - # The Product Code GUID is all that should be passed for MSI, and very - # FIRST, because it comes directly after /x, which is already set in the - # Uninstall-ChocolateyPackage msiargs (facepalm). - $packageArgs['silentArgs'] = "$($_.PSChildName) $($packageArgs['silentArgs'])" - - # Don't pass anything for file, it is ignored for msi (facepalm number 2) - # Alternatively if you need to pass a path to an msi, determine that and - # use it instead of the above in silentArgs, still very first - $packageArgs['file'] = '' - } else { - # NOTES: - # - You probably will need to sanitize $packageArgs['file'] as it comes from the registry and could be in a variety of fun but unusable formats - # - Split args from exe in $packageArgs['file'] and pass those args through $packageArgs['silentArgs'] or ignore them - # - Ensure you don't pass double quotes in $file (aka $packageArgs['file']) - otherwise you will get "Illegal characters in path when you attempt to run this" - # - Review the code for auto-uninstaller for all of the fun things it does in sanitizing - https://github.com/chocolatey/choco/blob/bfe351b7d10c798014efe4bfbb100b171db25099/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs#L142-L192 - } - - Uninstall-ChocolateyPackage @packageArgs - } -} elseif ($key.Count -eq 0) { - Write-Warning "$packageName has already been uninstalled by other means." -} elseif ($key.Count -gt 1) { - Write-Warning "$($key.Count) matches found!" - Write-Warning "To prevent accidental data loss, no programs will be uninstalled." - Write-Warning "Please alert package maintainer the following keys were matched:" - $key | % {Write-Warning "- $($_.DisplayName)"} +# Step 2: Remove installation path from the PATH environment variable +Write-Host "Removing '$installPath' from PATH environment variable..." +$envPath = [System.Environment]::GetEnvironmentVariable("Path", [System.EnvironmentVariableTarget]::User) +if ($envPath -match [regex]::Escape($installPath)) { + $newPath = ($envPath -split ';') -notmatch [regex]::Escape($installPath) -join ';' + [System.Environment]::SetEnvironmentVariable("Path", $newPath, [System.EnvironmentVariableTarget]::User) + Write-Host "Removed '$installPath' from PATH." +} else { + Write-Host "'$installPath' not found in PATH. No changes made." } -## OTHER POWERSHELL FUNCTIONS -## https://docs.chocolatey.org/en-us/create/functions -#Uninstall-ChocolateyZipPackage $packageName # Only necessary if you did not unpack to package directory - see https://docs.chocolatey.org/en-us/create/functions/uninstall-chocolateyzippackage -#Uninstall-ChocolateyEnvironmentVariable - https://docs.chocolatey.org/en-us/create/functions/uninstall-chocolateyenvironmentvariable -#Uninstall-BinFile # Only needed if you used Install-BinFile - see https://docs.chocolatey.org/en-us/create/functions/uninstall-binfile -## Remove any shortcuts you added in the install script. +# Skip Chocolatey uninstallation logic since no registry uninstall key is available +Write-Host "Skipping Chocolatey uninstallation logic as no uninstall registry key exists." +Write-Host "Custom uninstallation steps for $env:ChocolateyPackageName completed successfully." diff --git a/lib/cli/commands/scheduler/scheduler_manager.dart b/lib/cli/commands/scheduler/scheduler_manager.dart index a4a7e6e..ce554a0 100644 --- a/lib/cli/commands/scheduler/scheduler_manager.dart +++ b/lib/cli/commands/scheduler/scheduler_manager.dart @@ -254,22 +254,29 @@ class SchedulerManager { var processes = await findProcess(Platform.isWindows ? (isDebug ? 'dart.exe' : '$appName.exe') : 'scheduler -s'); - for (var process in processes) { - var processName = process.name; - if (isDebug) { - if (processName.contains('main.dart scheduler -s')) { - _currentScheduler = process; - } - } else { - if (processName.contains('$appName.exe scheduler -s')) { - _currentScheduler = process; - } - } - - if (_currentScheduler != null) { - print('Scheduler is running on pid [${_currentScheduler!.pid}].'); + if (Platform.isWindows) { + for (var process in processes) { + _currentScheduler = process; break; } + } else { + for (var process in processes) { + var processName = process.name; + if (isDebug) { + if (processName.contains('main.dart scheduler -s')) { + _currentScheduler = process; + } + } else { + if (processName.contains('$appName.exe scheduler -s')) { + _currentScheduler = process; + } + } + + if (_currentScheduler != null) { + print('Scheduler is running on pid [${_currentScheduler!.pid}].'); + break; + } + } } return simpleFuture; }