Skip to content

Commit 6e78ee6

Browse files
- ignore yarn install state
- swap osa cli to osa-setup so osa-scripts can register a larger cli with osa-setup a callable api
1 parent 0e688b2 commit 6e78ee6

5 files changed

Lines changed: 35 additions & 6 deletions

File tree

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,17 @@ yarn-error.*
4949
# macOS
5050
.DS_Store
5151
*.pem
52+
53+
54+
# Yarn 4 (Berry)
55+
.yarn/*
56+
!.yarn/releases
57+
!.yarn/plugins
58+
!.yarn/sdks
59+
!.yarn/versions
60+
!.yarnrc.yml
61+
.pnp.*
62+
# optional cache/state ignores
63+
.yarn/cache
64+
.yarn/unplugged
65+
.yarn/install-state.gz

.gitignore_global

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,18 @@ app/src/main/res/drawable-xxhdpi/node_modules_*
6060
app/src/main/res/drawable-xxxhdpi/__node_modules*
6161
app/src/main/res/drawable-xxxhdpi/__components*
6262
app/src/main/res/drawable-xxxhdpi/components_*
63-
app/src/main/res/drawable-xxxhdpi/node_modules_*
63+
app/src/main/res/drawable-xxxhdpi/node_modules_*
64+
65+
66+
# Yarn 4 (Berry)
67+
.yarn/*
68+
!.yarn/releases
69+
!.yarn/plugins
70+
!.yarn/sdks
71+
!.yarn/versions
72+
!.yarnrc.yml
73+
.pnp.*
74+
# optional cache/state ignores
75+
.yarn/cache
76+
.yarn/unplugged
77+
.yarn/install-state.gz

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@vllc/osa",
2+
"name": "@virtualize/osa",
33
"version": "1.0.0",
44
"description": "Scalable and unified config across all linux platforms such as mac, linux, and WSL",
55
"directories": {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if [[ -z "$OSA_REPO_PATH" ]]; then
1111
fi
1212

1313
# Create osa wrapper function that handles 'osa open' specially
14-
osa() {
15-
# Handle 'osa open' to open repo in editor
14+
osa-setup() {
15+
# Handle 'osa-setup open' to open repo in editor
1616
if [[ "$1" == "open" ]]; then
1717
local real_repo=$(readlink -f "${OSA_REPO_PATH:?OSA_REPO_PATH not set}")
1818
local editor="${OSA_EDITOR:-code}"

src/zsh/constructors/base.zsh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ if [[ "${OSA_CONFIG_COMPONENTS_ANDROID}" == "true" ]]; then
4747
safe_source "$OSA_ZSH_PLUGINS/android-sdk.zsh"
4848
fi
4949

50-
# OSA CLI runtime - exposes 'osa' command for quick access
51-
safe_source "$OSA_ZSH_ALIASES/osa.zsh"
50+
# OSA CLI runtime - exposes 'osa-setup' command for quick access
51+
# Noting that `osa` CLI is installed via osa-scripts repo and can run osa-setup by doing `osa setup`
52+
safe_source "$OSA_ZSH_ALIASES/osa-setup.zsh"
5253

5354
# Set OSA_CONFIG to the OSA installation directory
5455
OSA_CONFIG="${0:A:h:h:h:h}"

0 commit comments

Comments
 (0)