Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use lang: cmd on windows #1040

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

fix: use lang: cmd on windows #1040

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eeac8d2
fix: use lang: powershell on windows
divanshu-go Dec 23, 2024
d341341
Create use-platform.tsx
divanshu-go Dec 28, 2024
ae78200
Update cli-command-dialog.tsx
divanshu-go Dec 28, 2024
dd030c6
Update dev-mode-settings.tsx
divanshu-go Dec 28, 2024
2815847
Update dev-configuration.tsx
divanshu-go Dec 28, 2024
c5005ad
fix: use cmd
divanshu-go Dec 29, 2024
a9342ff
Merge branch 'mediar-ai:main' into pwsh-cmd
divanshu-go Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion screenpipe-app-tauri/components/cli-command-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
DialogTitle,
} from "./ui/dialog";
import { CodeBlock } from "./ui/codeblock";
import { platform } from "@tauri-apps/plugin-os";
import { useCopyToClipboard } from "@/lib/hooks/use-copy-to-clipboard";
import { useToast } from "@/components/ui/use-toast";
import { IconCode } from "./ui/icons";
Expand Down Expand Up @@ -138,7 +139,10 @@ export function CliCommandDialog({ settings }: CliCommandDialogProps) {
</DialogDescription>
</DialogHeader>
<div className="overflow-x-auto">
<CodeBlock language="bash" value={generateCliCommand()} />
<CodeBlock
language={platform() === "windows" ? "powershell" : "bash"}
divanshu-go marked this conversation as resolved.
Show resolved Hide resolved
value={generateCliCommand()}
/>
</div>
<DialogFooter>
<Button onClick={handleCopyCliCommand}>Copy to Clipboard</Button>
Expand Down
2 changes: 1 addition & 1 deletion screenpipe-app-tauri/components/dev-mode-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export const DevModeSettings = ({ localDataDir }: { localDataDir: string }) => {
thru CLI 👇
</p>
<CodeBlock
language="bash"
language={platform() === "windows" ? "powershell" : "bash"}
value={getDebuggingCommands(platform(), localDataDir)}
/>

Expand Down
2 changes: 1 addition & 1 deletion screenpipe-app-tauri/components/onboarding/dev-configuration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const OnboardingDevConfig: React.FC<OnboardingDevConfigProps> = ({
</p>
<CodeBlock
className="rounded-md mt-2"
language="bash"
language={platform() === "windows" ? "powershell" : "bash"}
value={instructions.command}
/>
</li>
Expand Down
Loading