diff --git a/native/win_install.ps1 b/native/install.ps1 similarity index 100% rename from native/win_install.ps1 rename to native/install.ps1 diff --git a/scripts/build.sh b/scripts/build.sh index f5bc9267..1937a7e0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -46,7 +46,7 @@ if [ "$(isWindowsMinGW)" = "True" ]; then -NoProfile \ -InputFormat None \ -ExecutionPolicy Bypass \ - native/win_install.ps1 -DebugDirBase native + native/install.ps1 -DebugDirBase native else native/install.sh local fi diff --git a/src/config.ts b/src/config.ts index 7836822e..20ef22b0 100644 --- a/src/config.ts +++ b/src/config.ts @@ -295,10 +295,8 @@ const DEFAULTS = o({ browser: "firefox", nativeinstallcmd: "curl -fsSl https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/install.sh | bash", - win_powershell_nativeinstallcmd: - "Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/win_install.ps1'))", - win_cmdexe_nativeinstallcmd: - '@"%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" -NoProfile -InputFormat None -Command "iex ((New-Object System.Net.WebClient).DownloadString(\'https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/win_install.ps1\'))"', + win_nativeinstallcmd: + "powershell -NoProfile -InputFormat None -Command \"Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/install.ps1'))\"", profiledir: "auto", // Container settings diff --git a/src/excmds.ts b/src/excmds.ts index 3c038b9d..f9f3633a 100644 --- a/src/excmds.ts +++ b/src/excmds.ts @@ -384,9 +384,9 @@ export async function native() { //#background export async function installnative() { if ((await browser.runtime.getPlatformInfo()).os === "win") { - const installstr = await config.get("win_powershell_nativeinstallcmd") + const installstr = await config.get("win_nativeinstallcmd") await yank(installstr) - fillcmdline("# Installation command copied to clipboard. Please paste and run it in Windows Powershell to install the native messenger.") + fillcmdline("# Installation command copied to clipboard. Please paste and run it from cmd.exe, PowerShell, or MinTTY to install the native messenger.") } else { const installstr = await config.get("nativeinstallcmd") await yank(installstr) @@ -435,7 +435,7 @@ export async function updatenative(interactive = true) { return } if ((await browser.runtime.getPlatformInfo()).os === "win") { - await Native.run(await config.get("win_cmdexe_nativeinstallcmd")) + await Native.run(await config.get("win_nativeinstallcmd")) } else { await Native.run(await config.get("nativeinstallcmd")) } @@ -948,7 +948,7 @@ export function home(all: "false" | "true" = "false") { /** Show this page. - `:help something` jumps to the entry for something. Something can be an excmd, an alias for an excmd or a binding. + `:help something` jumps to the entry for something. Something can be an excmd, an alias for an excmd or a binding. The "nmaps" list is a list of all the bindings for the command you're seeing and the "exaliases" list lists all its aliases.