hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-06 18:11:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix :updatenative command on Windows

Browse source
This commit is contained in:
Babil Golam Sarwar 2018-05-16 07:53:48 +10:00
parent 5878d8e6fd
commit dbeab7deb3
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config.ts
View file

@ -254,8 +254,10 @@ const DEFAULTS = o({
browser: "firefox",
nativeinstallcmd:
"curl -fsSl https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/install.sh | bash",
win_nativeinstallcmd:
win_powershell_nativeinstallcmd:
"Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/gsbabil/tridactyl/master/native/win_install.ps1'))",
win_cmdexe_nativeinstallcmd:
'@"%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString(\'https://raw.githubusercontent.com/gsbabil/tridactyl/master/native/win_install.ps1\'))"',
profiledir: "auto",
// Container settings

6
src/excmds.ts
View file

@ -308,9 +308,9 @@ export async function native() {
//#background
export async function installnative() {
if ((await browser.runtime.getPlatformInfo()).os === "win") {
const installstr = await config.get("win_nativeinstallcmd")
const installstr = await config.get("win_powershell_nativeinstallcmd")
await clipboard("yank", installstr)
fillcmdline("# Installation command copied to clipboard. Please paste and run it in Powershell to install the native messenger.")
fillcmdline("# Installation command copied to clipboard. Please paste and run it in Windows Powershell to install the native messenger.")
} else {
const installstr = await config.get("nativeinstallcmd")
await clipboard("yank", installstr)
@ -359,7 +359,7 @@ export async function updatenative(interactive = true) {
return
}
if ((await browser.runtime.getPlatformInfo()).os === "win") {
await Native.run(await config.get("win_nativeinstallcmd"))
await Native.run(await config.get("win_cmdexe_nativeinstallcmd"))
} else {
await Native.run(await config.get("nativeinstallcmd"))
}