hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-04 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make native{install,update} use corresponding tag for stable build

Browse source 
Beta builds will always use most recent messenger, which I think is probably fair;
old beta builds are unsupported.
This commit is contained in:
Oliver Blanthorn 2019-05-31 15:00:03 +01:00
parent 208adb2dfa
commit ef9f02d0da
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
native/install.sh
View file

@ -18,8 +18,10 @@ trap "echoerr 'Failed to install!'" ERR
XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/tridactyl"
XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/tridactyl"
manifest_loc="https://raw.githubusercontent.com/tridactyl/tridactyl/master/native/tridactyl.json"
native_loc="https://raw.githubusercontent.com/tridactyl/tridactyl/master/native/native_main.py"
# Use argument as version or 1.15.0, as that was the last version before we switched to using tags
manifest_loc="https://raw.githubusercontent.com/tridactyl/tridactyl/${1:-1.15.0}/native/tridactyl.json"
native_loc="https://raw.githubusercontent.com/tridactyl/tridactyl/${1:-1.15.0}/native/native_main.py"
# Decide where to put the manifest based on OS
case "$OSTYPE" in

9
native/win_install.ps1
View file

@ -2,7 +2,8 @@ Param (
[switch]$Uninstall = $false,
[switch]$NoPython= $false,
[string]$DebugDirBase = "",
[string]$InstallDirBase = ""
[string]$InstallDirBase = "",
[string]$Tag = "1.15.0"
)
#
@ -18,10 +19,8 @@ $global:WinPython3Command = "py -3 -u"
$global:MessengerManifestReplaceStr = "REPLACE_ME_WITH_SED"
$global:PowerShellMinimumVersion = 3
# $git_repo_owner should be "cmcaine" in final release
$git_repo_owner = "cmcaine"
# $git_repo_branch should be "master" in final release
$git_repo_branch = "master"
$git_repo_owner = "tridactyl"
$git_repo_branch = $Tag
$git_repo_proto = "https"
$git_repo_host = "raw.githubusercontent.com"
$git_repo_name = "tridactyl"

10
src/excmds.ts
View file

@ -654,12 +654,13 @@ export async function native() {
*/
//#background
export async function nativeinstall() {
const tag = TRI_VERSION.includes("pre") ? "master" : TRI_VERSION
if ((await browser.runtime.getPlatformInfo()).os === "win") {
const installstr = await config.get("win_nativeinstallcmd")
const installstr = (await config.get("win_nativeinstallcmd")).replace("%WINTAG", "-Tag " + tag)
await yank(installstr)
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")
const installstr = (await config.get("nativeinstallcmd")).replace("%TAG", tag)
await yank(installstr)
fillcmdline("# Installation command copied to clipboard. Please paste and run it in your shell to install the native messenger.")
}
@ -704,15 +705,16 @@ export async function source_quiet(...fileArr: string[]) {
*/
//#background
export async function updatenative(interactive = true) {
const tag = TRI_VERSION.includes("pre") ? "master" : TRI_VERSION
if (await Native.nativegate("0", interactive)) {
if ((await browser.runtime.getPlatformInfo()).os === "mac") {
if (interactive) logger.error("Updating the native messenger on OSX is broken. Please use `:installnative` instead.")
return
}
if ((await browser.runtime.getPlatformInfo()).os === "win") {
await Native.run(await config.get("win_nativeinstallcmd"))
await Native.run((await config.get("win_nativeinstallcmd")).replace("%WINTAG", "-Tag " + tag))
} else {
await Native.run(await config.get("nativeinstallcmd"))
await Native.run((await config.get("nativeinstallcmd")).replace("%TAG", tag))
}
if (interactive) native()

8
src/lib/config.ts
View file

@ -788,14 +788,18 @@ export class default_config {
/**
* Set this to something weird if you want to have fun every time Tridactyl tries to update its native messenger.
*
* %TAG will be replaced with your version of Tridactyl for stable builds, or "master" for beta builds
*/
nativeinstallcmd =
"curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/master/native/install.sh | bash"
"curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/master/native/install.sh -o /tmp/trinativeinstall.sh && bash /tmp/trinativeinstall.sh %TAG"
/**
* Set this to something weird if you want to have fun every time Tridactyl tries to update its native messenger.
*
* Replaces %WINTAG with "-Tag $TRI_VERSION", similarly to [[nativeinstallcmd]].
*/
win_nativeinstallcmd = `powershell -NoProfile -InputFormat None -Command "Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/win_install.ps1'))"`
win_nativeinstallcmd = `powershell -NoProfile -InputFormat None -Command "$TempFile = New-TemporaryFile; (New-Object System.Net.WebClient).DownloadFile('https://raw.githubusercontent.com/cmcaine/tridactyl/master/native/win_install.ps1',$TempFile); ./$TempFile %WINTAG"`
/**
* Used by :updatecheck and related built-in functionality to automatically check for updates and prompt users to upgrade.