Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(scoop-status): Properly support YML typed manifests #248

Merged
merged 16 commits into from
Dec 29, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'NEW' of github.com:Ash258/Scoop-Core into statusFix
  • Loading branch information
Ash258 committed Dec 28, 2021
commit d01acc9751d50ae49abb3aed6682c82713fc55e0
7 changes: 4 additions & 3 deletions lib/Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ function New-IssuePrompt {
.PARAMETER Body
Specifies more details to be posted as issue body.
.PARAMETER Version
Specifies the specific version to be shown in the title of issue.
Specifies the exact version to be shown in the title of issue.
#>
param([String] $Application, [String] $Bucket, [String] $Title, [String[]] $Body, [String] $Version)

Expand All @@ -334,10 +334,11 @@ function New-IssuePrompt {
$Version = $null
}
}

$url = known_bucket_repo $Bucket
$bucketPath = Join-Path $SCOOP_BUCKETS_DIRECTORY $Bucket

if ((Test-Path -LiteralPath $bucketPath -PathType 'Container') -and (Join-Path $bucketPath '.git' | Test-Path -PathType 'Container')) {
if ((Test-Path -LiteralPath $bucketPath) -and (Join-Path $bucketPath '.git' | Test-Path -PathType 'Container')) {
$remote = Invoke-GitCmd -Repository $bucketPath -Command 'config' -Argument '--get', 'remote.origin.url'
# Support ssh and http syntax
# git@PROVIDER:USER/REPO.git
Expand Down Expand Up @@ -421,7 +422,7 @@ class ScoopException: System.Exception {
$this.Message = $Message
}

ScoopException([String] $Message, [String] $Version = '') {
ScoopException([String] $Message, [String] $Version) {
$this.Message = $Message
$this.Version = $Version
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Installation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function Install-ScoopApplication {
$version = $ResolvedObject.ManifestObject.version

if ($version -match '[^\w\.\-\+_]') {
throw [ScoopException]::new("Invalid manifest|-Manifest version has unsupported character '$($matches[0])'.", $version) # TerminatingError thrown
throw [ScoopException]::new("Invalid manifest|-Manifest version has unsupported character '$($Matches[0])'.", $version) # TerminatingError thrown
}

if ($version -eq 'nightly') {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.