From 892dd302cede77f26e40ded61439a8f488399374 Mon Sep 17 00:00:00 2001 From: Nicolas Arnaud-Cormos Date: Wed, 12 Nov 2025 12:10:28 +0100 Subject: [PATCH] clink-flex-prompt@0.18: fix clink script path (#7171) The path installed via clink installscripts was different for each version of clink-flex-prompt, creating issues as the same script was loaded multiple times (with different version). This change makes the path consistent across versions, making sure only the latest one is loaded. Closes #7170 --- bucket/clink-flex-prompt.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bucket/clink-flex-prompt.json b/bucket/clink-flex-prompt.json index e5e65aac20..7ce9bbd952 100644 --- a/bucket/clink-flex-prompt.json +++ b/bucket/clink-flex-prompt.json @@ -15,10 +15,11 @@ ], "installer": { "script": [ + "$luapath = Join-Path (Split-Path -Path \"$dir\" -Parent) \"current\"", "if (Get-Command clink -ErrorAction SilentlyContinue) {", - " clink installscripts \"$dir\"", + " clink installscripts \"$luapath\"", "} elseif ($Env:CMDER_ROOT) {", - " & \"$Env:CMDER_ROOT\\vendor\\clink\\clink.bat\" installscripts \"$dir\"", + " & \"$Env:CMDER_ROOT\\vendor\\clink\\clink.bat\" installscripts \"$luapath\"", "} else {", " warn 'Clink or Cmder installation not found. Please manually install these scripts.'", "}" @@ -26,10 +27,11 @@ }, "uninstaller": { "script": [ + "$luapath = Join-Path (Split-Path -Path \"$dir\" -Parent) \"current\"", "if (Get-Command clink -ErrorAction SilentlyContinue) {", - " clink uninstallscripts \"$dir\"", + " clink uninstallscripts \"$luapath\"", "} elseif ($Env:CMDER_ROOT) {", - " & \"$Env:CMDER_ROOT\\vendor\\clink\\clink.bat\" uninstallscripts \"$dir\"", + " & \"$Env:CMDER_ROOT\\vendor\\clink\\clink.bat\" uninstallscripts \"$luapath\"", "}" ] },