Skip to content

Commit 408598d

Browse files
authored
Introduce defaults to os in install and shell (#222)
1 parent 5cd81f5 commit 408598d

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

website/docs/_advanced_install.mdx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ import Tabs from '@theme/Tabs';
22
import TabItem from '@theme/TabItem';
33
import SectionAbout from "../src/components/SectionAbout"
44
import DownloadButton from "../src/components/DownloadButton"
5+
import {currentOs} from "../src/components/osUtils";
56

67
<SectionAbout title="Advanced Installation">
78
<div class="margin--lg"/>
89
<Tabs
910
groupId="operating-systems-specific"
10-
defaultValue="windows"
11+
defaultValue={currentOs()}
1112
values={[
1213
{label: 'Windows', value: 'windows'},
13-
{label: 'MacOs', value: 'macOs'},
14+
{label: 'MacOs', value: 'mac'},
1415
{label: 'Linux', value: 'linux'},
1516
]}
1617
/>
@@ -22,10 +23,10 @@ Pick the installation method:
2223

2324
<Tabs
2425
groupId="operating-systems-specific"
25-
defaultValue="windows"
26+
defaultValue={currentOs()}
2627
values={[
2728
{label: 'Windows', value: 'windows'},
28-
{label: 'MacOs', value: 'macOs'},
29+
{label: 'MacOs', value: 'mac'},
2930
{label: 'Linux', value: 'linux'},
3031
]}
3132
>
@@ -180,11 +181,11 @@ Download MSI installer with Scala CLI for Windows
180181
</Tabs>
181182

182183
</TabItem>
183-
<TabItem value="macOs">
184+
<TabItem value="mac">
184185

185186
<Tabs
186-
groupId="macOs"
187-
defaultValue="manual"
187+
groupId="mac"
188+
defaultValue="brew"
188189
values={[
189190
{label: 'Manual', value: 'manual'},
190191
{label: 'Installer', value: 'installer'},
@@ -233,7 +234,7 @@ brew install Virtuslab/scala-cli/scala-cli
233234
<SectionAbout title="Standalone launcher">
234235
<div class="margin--lg"/>
235236
<Tabs
236-
defaultValue="macOS/Linux"
237+
defaultValue={currentOs() == 'win' ? 'windows' : 'macOS/Linux'}
237238
groupId="specific-standalone-launcher"
238239
values={[
239240
{label: 'macOS/Linux', value: 'macOS/Linux'},
@@ -269,7 +270,7 @@ Script to automatically download and cache standalone `scala-cli` launcher.
269270
<SectionAbout title="Shell completions">
270271
<div class="margin--lg"/>
271272
<Tabs
272-
defaultValue="bash"
273+
defaultValue={currentOs() == 'mac' ? 'zsh' : 'bash'}
273274
groupId="shell-specific"
274275
values={[
275276
{label: 'Bash', value: 'bash'},
@@ -294,8 +295,7 @@ scala-cli install completions
294295

295296
If any of the `scala-cli install completions` command complained that your shell cannot be determined, specify it
296297
with `--shell`
297-
<Tabs groupId="shell-specific"
298-
defaultValue="bash"
298+
<Tabs groupId="shell-specific"
299299
values={[
300300
{label: 'Bash', value: 'bash'},
301301
{label: 'zsh', value: 'zsh'},

website/src/components/BasicInstall.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ import React from 'react';
22
import Tabs from '@theme/Tabs';
33
import TabItem from '@theme/TabItem';
44
import BrowserOnly from '@docusaurus/BrowserOnly';
5-
6-
const currentOs = () => {
7-
const isCurrentOsEqual = (osShortName) => window.navigator.userAgent.indexOf(osShortName) !== -1
8-
if(isCurrentOsEqual("Win")) return "win"
9-
if(isCurrentOsEqual("Mac")) return "mac"
10-
else return "linux"
11-
}
5+
import {currentOs} from "./osUtils";
126

137
export default function BasicInstall(props){
148
return <BrowserOnly>{() =>

website/src/components/osUtils.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export const currentOs = () => {
2+
const isCurrentOsEqual = (osShortName) => {
3+
if(typeof window !== "undefined") {
4+
return window.navigator.userAgent.indexOf(osShortName) !== -1
5+
}
6+
return false
7+
}
8+
if(isCurrentOsEqual("Win")) return "win"
9+
if(isCurrentOsEqual("Mac")) return "mac"
10+
else return "linux"
11+
}

0 commit comments

Comments
 (0)