Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
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
11 changes: 7 additions & 4 deletions libexec/scoop-alias.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,16 @@ function add_alias($name, $command) {
# get current aliases from config
$aliases = init_alias_config
if ($aliases.$name) {
abort "Alias $name already exists."
abort "Alias '$name' already exists."
}

$alias_file = "scoop-$name"

# generate script
$shimdir = shimdir $false
if (Test-Path "$shimdir\$alias_file.ps1") {
abort "File '$alias_file.ps1' already exists in shims directory."
Comment thread
rashil2000 marked this conversation as resolved.
}
$script =
@(
"# Summary: $description",
Expand All @@ -67,18 +70,18 @@ function add_alias($name, $command) {
function rm_alias($name) {
$aliases = init_alias_config
if (!$name) {
abort 'Which alias should be removed?'
abort 'Alias to be removed has not been specified!'
}

if ($aliases.$name) {
"Removing alias $name..."
info "Removing alias '$name'..."

rm_shim $aliases.$name (shimdir $false)

$aliases.PSObject.Properties.Remove($name)
set_config $script:config_alias $aliases | Out-Null
} else {
abort "Alias $name doesn't exist."
abort "Alias '$name' doesn't exist."
}
}

Expand Down
17 changes: 8 additions & 9 deletions test/Scoop-Alias.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@ Describe 'Manipulate Alias' -Tag 'Scoop' {
& $alias_file | Should -Be 'hello, world!'
}

It 'Does not change existing alias if alias exists' {
$alias_file = "$shimdir\scoop-rm.ps1"
New-Item $alias_file -Type File -Force
$alias_file | Should -Exist
# NOTE: `abort()` in `add_alias()` cause tests error.
# It 'Does not change existing file if its filename same as alias name' {
# $alias_file = "$shimdir\scoop-rm.ps1"
# New-Item $alias_file -Type File -Force
# $alias_file | Should -Exist

add_alias 'rm' 'test'
& $alias_file | Should -Not -Be 'test'
}
Comment thread
niheaven marked this conversation as resolved.
# add_alias 'rm' '"test"'
# & $alias_file | Should -Be $null
# }

It 'Removes an existing alias' {
$alias_file = "$shimdir\scoop-rm.ps1"
add_alias 'rm' '"hello, world!"'
Comment thread
niheaven marked this conversation as resolved.

$alias_file | Should -Exist
Mock get_config { @(@{'rm' = 'scoop-rm' }) }

Expand Down
2 changes: 1 addition & 1 deletion test/Scoop-Versions.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Describe 'versions comparison' -Tag 'Scoop' {
Compare-Version 'nightly-20190801' 'nightly-20200801' | Should -Be 0
}

It 'handles nightly versions with `update_nightly`' {
It "handles nightly versions with 'update_nightly'" {
function get_config { $true }
Mock Get-Date { '20200801' }
Compare-Version 'nightly-20200801' 'nightly' | Should -Be 0
Expand Down