Skip to content

Commit 55aabf4

Browse files
authored
Merge pull request #9500 from gitbutlerapp/kv-branch-35
refactor: always show GitButler CLI install section in settings
2 parents 189ad1c + 9f9cf26 commit 55aabf4

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

apps/desktop/src/components/profileSettings/GeneralSettings.svelte

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@
5858
label: option.displayName,
5959
value: option.schemeIdentifer
6060
}));
61-
const settingsStore = $derived(settingsService.appSettings);
62-
const canUseActions = $derived($settingsStore?.featureFlags.actions ?? false);
6361
6462
$effect(() => {
6563
if ($user && !loaded) {
@@ -221,36 +219,34 @@
221219
{/snippet}
222220
</SectionCard>
223221

224-
{#if canUseActions}
225-
<SectionCard orientation="column">
226-
{#snippet title()}
227-
Install the GitButler CLI (but)
228-
{/snippet}
222+
<SectionCard orientation="column">
223+
{#snippet title()}
224+
Install the GitButler CLI (but)
225+
{/snippet}
229226

230-
{#snippet caption()}
231-
Installs the GitButler CLI (but) in your PATH, allowing you to use it from the terminal. This
232-
action will request admin privileges. Alternatively, you could create a symlink manually.
227+
{#snippet caption()}
228+
Installs the GitButler CLI (but) in your PATH, allowing you to use it from the terminal. This
229+
action will request admin privileges. Alternatively, you could create a symlink manually.
233230

234-
{#if showSymlink}
235-
<CliSymLink class="m-top-14" />
236-
{/if}
237-
{/snippet}
231+
{#if showSymlink}
232+
<CliSymLink class="m-top-14" />
233+
{/if}
234+
{/snippet}
238235

239-
<div class="flex flex-col gap-16">
240-
<div class="flex gap-8 justify-end">
241-
<Button style="pop" icon="play" onclick={async () => await invoke('install_cli')}
242-
>Install But CLI</Button
243-
>
244-
<Button
245-
style="neutral"
246-
kind="outline"
247-
disabled={showSymlink}
248-
onclick={() => (showSymlink = !showSymlink)}>Show symlink</Button
249-
>
250-
</div>
236+
<div class="flex flex-col gap-16">
237+
<div class="flex gap-8 justify-end">
238+
<Button style="pop" icon="play" onclick={async () => await invoke('install_cli')}
239+
>Install But CLI</Button
240+
>
241+
<Button
242+
style="neutral"
243+
kind="outline"
244+
disabled={showSymlink}
245+
onclick={() => (showSymlink = !showSymlink)}>Show symlink</Button
246+
>
251247
</div>
252-
</SectionCard>
253-
{/if}
248+
</div>
249+
</SectionCard>
254250

255251
<Spacer />
256252

0 commit comments

Comments
 (0)