feat: add choco and scoop to opencode upgrade methods (#8439)
This commit is contained in:
committed by
GitHub
parent
b75d4d1c5e
commit
ad17e8d1f0
@@ -16,7 +16,7 @@ export const UpgradeCommand = {
|
|||||||
alias: "m",
|
alias: "m",
|
||||||
describe: "installation method to use",
|
describe: "installation method to use",
|
||||||
type: "string",
|
type: "string",
|
||||||
choices: ["curl", "npm", "pnpm", "bun", "brew"],
|
choices: ["curl", "npm", "pnpm", "bun", "brew", "choco", "scoop"],
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handler: async (args: { target?: string; method?: string }) => {
|
handler: async (args: { target?: string; method?: string }) => {
|
||||||
@@ -56,8 +56,14 @@ export const UpgradeCommand = {
|
|||||||
const err = await Installation.upgrade(method, target).catch((err) => err)
|
const err = await Installation.upgrade(method, target).catch((err) => err)
|
||||||
if (err) {
|
if (err) {
|
||||||
spinner.stop("Upgrade failed", 1)
|
spinner.stop("Upgrade failed", 1)
|
||||||
if (err instanceof Installation.UpgradeFailedError) prompts.log.error(err.data.stderr)
|
if (err instanceof Installation.UpgradeFailedError) {
|
||||||
else if (err instanceof Error) prompts.log.error(err.message)
|
// necessary because choco only allows install/upgrade in elevated terminals
|
||||||
|
if (method === "choco" && err.data.stderr.includes("not running from an elevated command shell")) {
|
||||||
|
prompts.log.error("Please run the terminal as Administrator and try again")
|
||||||
|
} else {
|
||||||
|
prompts.log.error(err.data.stderr)
|
||||||
|
}
|
||||||
|
} else if (err instanceof Error) prompts.log.error(err.message)
|
||||||
prompts.outro("Done")
|
prompts.outro("Done")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,6 +83,14 @@ export namespace Installation {
|
|||||||
name: "brew" as const,
|
name: "brew" as const,
|
||||||
command: () => $`brew list --formula opencode`.throws(false).quiet().text(),
|
command: () => $`brew list --formula opencode`.throws(false).quiet().text(),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "scoop" as const,
|
||||||
|
command: () => $`scoop list opencode`.throws(false).quiet().text(),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "choco" as const,
|
||||||
|
command: () => $`choco list --limit-output opencode`.throws(false).quiet().text(),
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
checks.sort((a, b) => {
|
checks.sort((a, b) => {
|
||||||
@@ -95,7 +103,9 @@ export namespace Installation {
|
|||||||
|
|
||||||
for (const check of checks) {
|
for (const check of checks) {
|
||||||
const output = await check.command()
|
const output = await check.command()
|
||||||
if (output.includes(check.name === "brew" ? "opencode" : "opencode-ai")) {
|
const installedName =
|
||||||
|
check.name === "brew" || check.name === "choco" || check.name === "scoop" ? "opencode" : "opencode-ai"
|
||||||
|
if (output.includes(installedName)) {
|
||||||
return check.name
|
return check.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -144,20 +154,28 @@ export namespace Installation {
|
|||||||
})
|
})
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
case "choco":
|
||||||
|
cmd = $`echo Y | choco upgrade opencode --version=${target}`
|
||||||
|
break
|
||||||
|
case "scoop":
|
||||||
|
cmd = $`scoop install extras/opencode@${target}`
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unknown method: ${method}`)
|
throw new Error(`Unknown method: ${method}`)
|
||||||
}
|
}
|
||||||
const result = await cmd.quiet().throws(false)
|
const result = await cmd.quiet().throws(false)
|
||||||
|
if (result.exitCode !== 0) {
|
||||||
|
const stderr = method === "choco" ? "not running from an elevated command shell" : result.stderr.toString("utf8")
|
||||||
|
throw new UpgradeFailedError({
|
||||||
|
stderr: stderr,
|
||||||
|
})
|
||||||
|
}
|
||||||
log.info("upgraded", {
|
log.info("upgraded", {
|
||||||
method,
|
method,
|
||||||
target,
|
target,
|
||||||
stdout: result.stdout.toString(),
|
stdout: result.stdout.toString(),
|
||||||
stderr: result.stderr.toString(),
|
stderr: result.stderr.toString(),
|
||||||
})
|
})
|
||||||
if (result.exitCode !== 0)
|
|
||||||
throw new UpgradeFailedError({
|
|
||||||
stderr: result.stderr.toString("utf8"),
|
|
||||||
})
|
|
||||||
await $`${process.execPath} --version`.nothrow().quiet().text()
|
await $`${process.execPath} --version`.nothrow().quiet().text()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,6 +213,29 @@ export namespace Installation {
|
|||||||
.then((data: any) => data.version)
|
.then((data: any) => data.version)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (detectedMethod === "choco") {
|
||||||
|
return fetch(
|
||||||
|
"https://community.chocolatey.org/api/v2/Packages?$filter=Id%20eq%20%27opencode%27%20and%20IsLatestVersion&$select=Version",
|
||||||
|
{ headers: { Accept: "application/json;odata=verbose" } },
|
||||||
|
)
|
||||||
|
.then((res) => {
|
||||||
|
if (!res.ok) throw new Error(res.statusText)
|
||||||
|
return res.json()
|
||||||
|
})
|
||||||
|
.then((data: any) => data.d.results[0].Version)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (detectedMethod === "scoop") {
|
||||||
|
return fetch("https://raw.githubusercontent.com/ScoopInstaller/Extras/master/bucket/opencode.json", {
|
||||||
|
headers: { Accept: "application/json" },
|
||||||
|
})
|
||||||
|
.then((res) => {
|
||||||
|
if (!res.ok) throw new Error(res.statusText)
|
||||||
|
return res.json()
|
||||||
|
})
|
||||||
|
.then((data: any) => data.version)
|
||||||
|
}
|
||||||
|
|
||||||
return fetch("https://api.github.com/repos/anomalyco/opencode/releases/latest")
|
return fetch("https://api.github.com/repos/anomalyco/opencode/releases/latest")
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (!res.ok) throw new Error(res.statusText)
|
if (!res.ok) throw new Error(res.statusText)
|
||||||
|
|||||||
Reference in New Issue
Block a user