Skip to content

Commit

Permalink
Sync develop
Browse files Browse the repository at this point in the history
  • Loading branch information
niheaven committed Apr 18, 2024
1 parent 228e353 commit 867ed69
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Expand Up @@ -65,7 +65,6 @@
- **scoop-update:** Check for running process before wasting time on download ([#5799](https://github.com/ScoopInstaller/Scoop/issues/5799))
- **decompress:** Disable progress bar to improve `Expand-Archive` performance ([#5410](https://github.com/ScoopInstaller/Scoop/issues/5410))
- **shim:** Update kiennq-shim to v3.1.1 ([#5841](https://github.com/ScoopInstaller/Scoop/issues/5841), [#5847](https://github.com/ScoopInstaller/Scoop/issues/5847))
- **scoop-search:** Use SQLite for caching apps to speed up local search ([#5851](https://github.com/ScoopInstaller/Scoop/issues/5851))

### Code Refactoring

Expand Down
3 changes: 0 additions & 3 deletions lib/core.ps1
Expand Up @@ -145,9 +145,6 @@ function set_config {
$scoopConfig.PSObject.Properties.Remove($name)
}

# Initialize config's change
Complete-ConfigChange -Name $name -Value $value

# Save config with UTF8NoBOM encoding
ConvertTo-Json $scoopConfig | Out-UTF8File -FilePath $configFile
return $scoopConfig
Expand Down
10 changes: 5 additions & 5 deletions lib/manifest.ps1
Expand Up @@ -23,7 +23,7 @@ function url_manifest($url) {
} catch {
throw
}
if(!$str) { return $null }
if (!$str) { return $null }
try {
$str | ConvertFrom-Json -ErrorAction Stop
} catch {
Expand Down Expand Up @@ -138,7 +138,7 @@ function generate_user_manifest($app, $bucket, $version) {
warn "Attempting to generate manifest for '$app' ($version)"

ensure (usermanifestsdir) | Out-Null
$manifest_path = fullpath "$(usermanifestsdir)\$app.json"
$manifest_path = "$(usermanifestsdir)\$app.json"

if (get_config USE_SQLITE_CACHE) {
$cached_manifest = (Get-ScoopDBItem -Name $app -Bucket $bucket -Version $version).manifest
Expand All @@ -156,7 +156,7 @@ function generate_user_manifest($app, $bucket, $version) {
Invoke-AutoUpdate $app $manifest_path $manifest $version $(@{ })
return $manifest_path
} catch {
write-host -f darkred "Could not install $app@$version"
Write-Host -ForegroundColor DarkRed "Could not install $app@$version"
}

return $null
Expand All @@ -166,5 +166,5 @@ function url($manifest, $arch) { arch_specific 'url' $manifest $arch }
function installer($manifest, $arch) { arch_specific 'installer' $manifest $arch }
function uninstaller($manifest, $arch) { arch_specific 'uninstaller' $manifest $arch }
function hash($manifest, $arch) { arch_specific 'hash' $manifest $arch }
function extract_dir($manifest, $arch) { arch_specific 'extract_dir' $manifest $arch}
function extract_to($manifest, $arch) { arch_specific 'extract_to' $manifest $arch}
function extract_dir($manifest, $arch) { arch_specific 'extract_dir' $manifest $arch }
function extract_to($manifest, $arch) { arch_specific 'extract_to' $manifest $arch }

0 comments on commit 867ed69

Please sign in to comment.