Skip to content

Commit 965669b

Browse files
authored
🔀 Merge pull request #20 from gluons/remove-alias-powershell-ge-6
2 parents 57e6bad + 77f3185 commit 965669b

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

‎src/aliases.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
. $PSScriptRoot\utils.ps1
22

33
# Prevent conflict with built-in aliases
4-
Remove-Alias gc
5-
Remove-Alias gcb
6-
Remove-Alias gcm
7-
Remove-Alias gcs
8-
Remove-Alias gl
9-
Remove-Alias gm
10-
Remove-Alias gp
11-
Remove-Alias gpv
4+
Remove-Alias gc -Force
5+
Remove-Alias gcb -Force
6+
Remove-Alias gcm -Force
7+
Remove-Alias gcs -Force
8+
Remove-Alias gl -Force
9+
Remove-Alias gm -Force
10+
Remove-Alias gp -Force
11+
Remove-Alias gpv -Force
1212

1313
function g {
1414
git $args

‎src/utils.ps1

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ function Get-Git-CurrentBranch {
1212
}
1313
}
1414

15-
function Remove-Alias ([string] $AliasName) {
16-
while (Test-Path Alias:$AliasName) {
17-
Remove-Item Alias:$AliasName -Force 2> $null
15+
# Don't add `Remove-Alias` on PowerShell >= 6.
16+
# PowerShell >= 6 already has built-in `Remove-Alias`.
17+
# Let use built-in `Remove-Alias` on PowerShell >= 6.
18+
if ($PSVersionTable.PSVersion.Major -le 5) {
19+
function Remove-Alias ([string] $AliasName) {
20+
while (Test-Path Alias:$AliasName) {
21+
Remove-Item Alias:$AliasName -Force 2> $null
22+
}
1823
}
1924
}
2025

0 commit comments

Comments
 (0)