Fix Gist setup and first-run bootstrap
This commit is contained in:
@@ -191,7 +191,7 @@ function runPowerShell(command, extraEnv = {}) {
|
||||
const result = spawnSync("powershell.exe", ["-NoProfile", "-STA", "-Command", command], {
|
||||
encoding: "utf8",
|
||||
env: { ...process.env, ...extraEnv },
|
||||
windowsHide: true,
|
||||
windowsHide: false,
|
||||
});
|
||||
if (result.status !== 0) throw new Error(result.stderr.trim() || "Windows dialog failed");
|
||||
return result.stdout.trim();
|
||||
@@ -199,10 +199,10 @@ function runPowerShell(command, extraEnv = {}) {
|
||||
|
||||
function nativeFileDialog(mode) {
|
||||
if (process.platform === "win32") {
|
||||
const common = "[Console]::OutputEncoding=[Text.Encoding]::UTF8; Add-Type -AssemblyName System.Windows.Forms; ";
|
||||
const common = "[Console]::OutputEncoding=[Text.Encoding]::UTF8; Add-Type -AssemblyName System.Windows.Forms; $o=New-Object System.Windows.Forms.Form; $o.TopMost=$true; $o.ShowInTaskbar=$false; $o.Opacity=0; $o.Show(); $o.Activate(); ";
|
||||
const command = mode === "save"
|
||||
? `${common}$d=New-Object System.Windows.Forms.SaveFileDialog; $d.Filter='Zed settings (*.json)|*.json'; $d.FileName='${BUNDLE_NAME}'; $d.AddExtension=$true; if($d.ShowDialog() -eq 'OK'){[Console]::Write($d.FileName)}`
|
||||
: `${common}$d=New-Object System.Windows.Forms.OpenFileDialog; $d.Filter='Zed settings (*.json)|*.json'; $d.FileName='${BUNDLE_NAME}'; if($d.ShowDialog() -eq 'OK'){[Console]::Write($d.FileName)}`;
|
||||
? `${common}$d=New-Object System.Windows.Forms.SaveFileDialog; $d.Filter='Zed settings (*.json)|*.json'; $d.FileName='${BUNDLE_NAME}'; $d.AddExtension=$true; if($d.ShowDialog($o) -eq 'OK'){[Console]::Write($d.FileName)}; $o.Close()`
|
||||
: `${common}$d=New-Object System.Windows.Forms.OpenFileDialog; $d.Filter='Zed settings (*.json)|*.json'; $d.FileName='${BUNDLE_NAME}'; if($d.ShowDialog($o) -eq 'OK'){[Console]::Write($d.FileName)}; $o.Close()`;
|
||||
return runPowerShell(command);
|
||||
}
|
||||
if (process.platform === "darwin") {
|
||||
@@ -220,7 +220,42 @@ function nativeFileDialog(mode) {
|
||||
|
||||
function nativeInput(prompt, title, defaultValue = "") {
|
||||
if (process.platform === "win32") {
|
||||
const command = "[Console]::OutputEncoding=[Text.Encoding]::UTF8; Add-Type -AssemblyName Microsoft.VisualBasic; [Console]::Write([Microsoft.VisualBasic.Interaction]::InputBox($env:ZED_SYNC_PROMPT,$env:ZED_SYNC_TITLE,$env:ZED_SYNC_DEFAULT))";
|
||||
const command = `
|
||||
[Console]::OutputEncoding=[Text.Encoding]::UTF8
|
||||
Add-Type -AssemblyName System.Windows.Forms
|
||||
Add-Type -AssemblyName System.Drawing
|
||||
$f=New-Object System.Windows.Forms.Form
|
||||
$f.Text=$env:ZED_SYNC_TITLE
|
||||
$f.Size=New-Object System.Drawing.Size(620,190)
|
||||
$f.StartPosition='CenterScreen'
|
||||
$f.TopMost=$true
|
||||
$f.ShowInTaskbar=$true
|
||||
$f.FormBorderStyle='FixedDialog'
|
||||
$f.MaximizeBox=$false
|
||||
$f.MinimizeBox=$false
|
||||
$l=New-Object System.Windows.Forms.Label
|
||||
$l.Text=$env:ZED_SYNC_PROMPT
|
||||
$l.AutoSize=$false
|
||||
$l.Location=New-Object System.Drawing.Point(14,14)
|
||||
$l.Size=New-Object System.Drawing.Size(575,42)
|
||||
$t=New-Object System.Windows.Forms.TextBox
|
||||
$t.Text=$env:ZED_SYNC_DEFAULT
|
||||
$t.Location=New-Object System.Drawing.Point(14,62)
|
||||
$t.Size=New-Object System.Drawing.Size(575,24)
|
||||
$ok=New-Object System.Windows.Forms.Button
|
||||
$ok.Text='OK'
|
||||
$ok.DialogResult=[System.Windows.Forms.DialogResult]::OK
|
||||
$ok.Location=New-Object System.Drawing.Point(427,105)
|
||||
$cancel=New-Object System.Windows.Forms.Button
|
||||
$cancel.Text='Cancel'
|
||||
$cancel.DialogResult=[System.Windows.Forms.DialogResult]::Cancel
|
||||
$cancel.Location=New-Object System.Drawing.Point(514,105)
|
||||
$f.Controls.AddRange(@($l,$t,$ok,$cancel))
|
||||
$f.AcceptButton=$ok
|
||||
$f.CancelButton=$cancel
|
||||
$f.Add_Shown({$f.Activate();$t.Focus();$t.SelectAll()})
|
||||
if($f.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK){[Console]::Write($t.Text)}
|
||||
`;
|
||||
return runPowerShell(command, {
|
||||
ZED_SYNC_PROMPT: prompt,
|
||||
ZED_SYNC_TITLE: title,
|
||||
@@ -239,7 +274,7 @@ function nativeInput(prompt, title, defaultValue = "") {
|
||||
|
||||
function nativeMessage(message, title = "Zed Settings Sync", error = false) {
|
||||
if (process.platform === "win32") {
|
||||
const command = "Add-Type -AssemblyName System.Windows.Forms; [void][System.Windows.Forms.MessageBox]::Show($env:ZED_SYNC_MESSAGE,$env:ZED_SYNC_TITLE,'OK',$env:ZED_SYNC_ICON)";
|
||||
const command = "Add-Type -AssemblyName System.Windows.Forms; $o=New-Object System.Windows.Forms.Form; $o.TopMost=$true; $o.ShowInTaskbar=$false; $o.Opacity=0; $o.Show(); $o.Activate(); [void][System.Windows.Forms.MessageBox]::Show($o,$env:ZED_SYNC_MESSAGE,$env:ZED_SYNC_TITLE,'OK',$env:ZED_SYNC_ICON); $o.Close()";
|
||||
runPowerShell(command, {
|
||||
ZED_SYNC_MESSAGE: message,
|
||||
ZED_SYNC_TITLE: title,
|
||||
@@ -257,7 +292,7 @@ function nativeMessage(message, title = "Zed Settings Sync", error = false) {
|
||||
|
||||
function nativeConfirm(message, title = "Zed Settings Sync") {
|
||||
if (process.platform === "win32") {
|
||||
const command = "Add-Type -AssemblyName System.Windows.Forms; [Console]::Write([System.Windows.Forms.MessageBox]::Show($env:ZED_SYNC_MESSAGE,$env:ZED_SYNC_TITLE,'YesNo','Warning'))";
|
||||
const command = "Add-Type -AssemblyName System.Windows.Forms; $o=New-Object System.Windows.Forms.Form; $o.TopMost=$true; $o.ShowInTaskbar=$false; $o.Opacity=0; $o.Show(); $o.Activate(); [Console]::Write([System.Windows.Forms.MessageBox]::Show($o,$env:ZED_SYNC_MESSAGE,$env:ZED_SYNC_TITLE,'YesNo','Warning')); $o.Close()";
|
||||
return runPowerShell(command, { ZED_SYNC_MESSAGE: message, ZED_SYNC_TITLE: title }) === "Yes";
|
||||
}
|
||||
if (process.platform === "darwin") {
|
||||
@@ -297,6 +332,7 @@ function normalizeGistId(value) {
|
||||
|
||||
async function promptForGist() {
|
||||
const state = await readSyncConfiguration();
|
||||
console.log("Opening Gist configuration dialog...");
|
||||
const entered = nativeInput(
|
||||
"Paste the GitHub Gist ID or full Gist URL. The previous value is remembered on this machine.",
|
||||
"Zed Settings Gist",
|
||||
@@ -313,7 +349,10 @@ async function promptForGist() {
|
||||
}
|
||||
|
||||
function runGh(args, input) {
|
||||
const result = spawnSync("gh", args, { encoding: "utf8", input, windowsHide: true });
|
||||
const env = { ...process.env };
|
||||
delete env.GH_TOKEN;
|
||||
delete env.GITHUB_TOKEN;
|
||||
const result = spawnSync("gh", args, { encoding: "utf8", env, input, windowsHide: true });
|
||||
if (result.error?.code === "ENOENT") {
|
||||
throw new Error("GitHub CLI (gh) is not installed. Install it, then run: gh auth login");
|
||||
}
|
||||
@@ -334,6 +373,15 @@ function updateRemoteGist(gistId, contents) {
|
||||
return JSON.parse(runGh(["api", "--method", "PATCH", `gists/${gistId}`, "--input", "-"], payload));
|
||||
}
|
||||
|
||||
function createRemoteGist(contents) {
|
||||
const payload = JSON.stringify({
|
||||
description: "Zed settings sync",
|
||||
public: false,
|
||||
files: { [BUNDLE_NAME]: { content: contents } },
|
||||
});
|
||||
return JSON.parse(runGh(["api", "--method", "POST", "gists", "--input", "-"], payload));
|
||||
}
|
||||
|
||||
function shortHash(hash) {
|
||||
return hash ? hash.slice(0, 12) : "none";
|
||||
}
|
||||
@@ -345,9 +393,21 @@ async function configureGist() {
|
||||
}
|
||||
|
||||
async function pushGist() {
|
||||
const state = await promptForGist();
|
||||
if (!state) return;
|
||||
const state = await readSyncConfiguration();
|
||||
const localBundle = await createBundle();
|
||||
if (!state.config.gist_id) {
|
||||
console.log("No Gist is configured. Asking to create one...");
|
||||
const proceed = nativeConfirm(
|
||||
"No GitHub Gist is configured. Create a new Secret Gist from this machine's current Zed settings?",
|
||||
);
|
||||
if (!proceed) return;
|
||||
const created = createRemoteGist(localBundle.contents);
|
||||
state.config.gist_id = created.id;
|
||||
state.config.last_synced_hash = localBundle.hash;
|
||||
await saveSyncConfiguration(state.path, state.config);
|
||||
nativeMessage(`Created and uploaded Secret Gist:\n${created.html_url || created.id}\n\nSHA-256: ${localBundle.hash}`);
|
||||
return;
|
||||
}
|
||||
const remote = readRemoteGist(state.config.gist_id);
|
||||
const remoteHash = remote.parsed?.hash || "";
|
||||
const lastHash = state.config.last_synced_hash;
|
||||
|
||||
Reference in New Issue
Block a user