yetone
90b1ac7956
Add to PATH put the portable download's folder first in the user's PATH, but a terminal looks for magpie by that name only, so the command was never found. cliPlace now writes magpie.cmd beside a program not named magpie.exe: it runs %~dp0<the program's name> %*, which an update keeps, since it replaces the program where it is under its name. ReadCLI reads that magpie.cmd as this app (shimRuns), and the GUI says, in Add's tooltip, the row and the status, that magpie.cmd runs magpie-windows-amd64.exe. Going through cmd also makes PowerShell wait for the GUI-linked program and gives it the console. TestCLIShim and cli-path.test.cjs's new case fail without the change.
59 lines
1.8 KiB
Go
59 lines
1.8 KiB
Go
package update
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
// #942: the site's Windows download is magpie-windows-amd64.exe, and Add
|
|
// to PATH put its folder on PATH, where a terminal finds no `magpie`. Add
|
|
// writes a magpie.cmd beside a program not named magpie.exe that runs it by
|
|
// its folder and name, which an update keeps, and the Command line reads
|
|
// that magpie.cmd as this app; one written for another program isn't.
|
|
func TestCLIShim(t *testing.T) {
|
|
dir := t.TempDir()
|
|
exe := filepath.Join(dir, "magpie-windows-amd64.exe")
|
|
if err := os.WriteFile(exe, []byte("MZ"), 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
p, err := writeShim(exe)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if p != filepath.Join(dir, "magpie.cmd") {
|
|
t.Fatalf("shim at %q", p)
|
|
}
|
|
b, err := os.ReadFile(p)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !strings.Contains(string(b), "\"%~dp0magpie-windows-amd64.exe\" %*\r\n") || !strings.HasPrefix(string(b), "@echo off\r\n") {
|
|
t.Fatalf("magpie.cmd:\n%q", b)
|
|
}
|
|
if !shimRuns(p, exe) {
|
|
t.Fatal("the magpie.cmd written isn't read as running this app")
|
|
}
|
|
if shimRuns(p, filepath.Join(dir, "magpie-old.exe")) {
|
|
t.Fatal("magpie.cmd read as running another program")
|
|
}
|
|
// renamed, as a second download is: written again for the new name
|
|
exe2 := filepath.Join(dir, "magpie-windows-amd64 (1).exe")
|
|
if _, err := writeShim(exe2); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !shimRuns(p, exe2) || shimRuns(p, exe) {
|
|
t.Fatal("magpie.cmd not written again for the renamed program")
|
|
}
|
|
|
|
// magpie.exe is found by its own name: nothing written
|
|
dir2 := t.TempDir()
|
|
if p, err := writeShim(filepath.Join(dir2, "Magpie.exe")); err != nil || p != "" {
|
|
t.Fatalf("magpie.exe given a shim: %q, %v", p, err)
|
|
}
|
|
if _, err := os.Stat(filepath.Join(dir2, "magpie.cmd")); !os.IsNotExist(err) {
|
|
t.Fatal("magpie.cmd written beside magpie.exe")
|
|
}
|
|
}
|