Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2025-04-06 16:21:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix init error in PowerShell strict mode (#233)

Browse Source
This commit is contained in:
Ajeet D'Souza 2021-07-17 17:57:04 +05:30 committed by GitHub
parent b9b0abe471
commit 20d9f3d18c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Nushell: errors on 0.33.0. - Nushell: errors on 0.33.0.
- PowerShell: errors when initializing in `StrictMode`.
## [0.7.2] - 2021-06-10 ## [0.7.2] - 2021-06-10

3
src/shell.rs
View File

@ -280,7 +280,8 @@ mod tests {
#[values(false, true)] resolve_symlinks: bool, #[values(false, true)] resolve_symlinks: bool,
) { ) {
let opts = Opts { cmd, hook, echo, resolve_symlinks }; let opts = Opts { cmd, hook, echo, resolve_symlinks };
let source = Powershell(&opts).render().unwrap(); let mut source = "Set-StrictMode -Version latest\n".to_string();
Powershell(&opts).render_into(&mut source).unwrap();
Command::new("pwsh") Command::new("pwsh")
.args(&["-NoLogo", "-NonInteractive", "-NoProfile", "-Command", &source]) .args(&["-NoLogo", "-NonInteractive", "-NoProfile", "-Command", &source])

7
templates/powershell.txt
View File

@ -34,8 +34,11 @@ function __zoxide_hook {
} }
# Initialize hook. # Initialize hook.
if ($__zoxide_hooked -ne '1') { {# Initialize $__zoxide_hooked if it does not exist. Removing this will cause
$__zoxide_hooked = '1' # an unset variable error in StrictMode. #}
$__zoxide_hooked = (Get-Variable __zoxide_hooked -ValueOnly -ErrorAction silentlycontinue)
if ($__zoxide_hooked -ne 1) {
$__zoxide_hooked = 1
{%- match hook %} {%- match hook %}
{%- when InitHook::None %} {%- when InitHook::None %}
{{ not_configured }} {{ not_configured }}