From af674d57dec7e74b0710255872aedae93bb322cd Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Tue, 4 Oct 2022 11:56:46 +0200 Subject: [PATCH 1/5] Reorder zsh because newer macOS uses zsh --- .../version-0.70/_getting-started-macos-android.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/website/versioned_docs/version-0.70/_getting-started-macos-android.md b/website/versioned_docs/version-0.70/_getting-started-macos-android.md index fd52291bab0..4fcb29b2b45 100644 --- a/website/versioned_docs/version-0.70/_getting-started-macos-android.md +++ b/website/versioned_docs/version-0.70/_getting-started-macos-android.md @@ -73,7 +73,7 @@ Finally, click "Apply" to download and install the Android SDK and related build The React Native tools require some environment variables to be set up in order to build apps with native code. -Add the following lines to your `$HOME/.bash_profile` or `$HOME/.bashrc` (if you are using `zsh` then `~/.zprofile` or `~/.zshrc`) config file: +Add the following lines to your `$HOME/.zprofile` or `$HOME/.zshrc` (if you are using `bash`, then `~/.bash_profile` or `~/.bashrc`) config file: ```shell export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk @@ -81,9 +81,7 @@ export PATH=$PATH:$ANDROID_SDK_ROOT/emulator export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools ``` -> `.bash_profile` is specific to `bash`. If you're using another shell, you will need to edit the appropriate shell-specific config file. - -Type `source $HOME/.bash_profile` for `bash` or `source $HOME/.zprofile` to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. +Run `source $HOME/.zprofile` (or `source $HOME/.bash_profile` for `bash`) to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. > Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Preferences" dialog, under **Appearance & Behavior** → **System Settings** → **Android SDK**. From 9287883b29d232ded1120e62a8be27adb582181a Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Tue, 4 Oct 2022 14:08:16 +0200 Subject: [PATCH 2/5] Update website/versioned_docs/version-0.70/_getting-started-macos-android.md Co-authored-by: Nicola Corti --- .../version-0.70/_getting-started-macos-android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versioned_docs/version-0.70/_getting-started-macos-android.md b/website/versioned_docs/version-0.70/_getting-started-macos-android.md index 4fcb29b2b45..7d4edaa7035 100644 --- a/website/versioned_docs/version-0.70/_getting-started-macos-android.md +++ b/website/versioned_docs/version-0.70/_getting-started-macos-android.md @@ -73,7 +73,7 @@ Finally, click "Apply" to download and install the Android SDK and related build The React Native tools require some environment variables to be set up in order to build apps with native code. -Add the following lines to your `$HOME/.zprofile` or `$HOME/.zshrc` (if you are using `bash`, then `~/.bash_profile` or `~/.bashrc`) config file: +Add the following lines to your `~/.zprofile` or `~/.zshrc` (if you are using `bash`, then `~/.bash_profile` or `~/.bashrc`) config file: ```shell export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk From caa1619e2b511e0cd6f1d2c95bcd19cb2e698915 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Tue, 4 Oct 2022 14:09:03 +0200 Subject: [PATCH 3/5] Switch $HOME to tilde --- .../version-0.70/_getting-started-macos-android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versioned_docs/version-0.70/_getting-started-macos-android.md b/website/versioned_docs/version-0.70/_getting-started-macos-android.md index 7d4edaa7035..eada9f7e420 100644 --- a/website/versioned_docs/version-0.70/_getting-started-macos-android.md +++ b/website/versioned_docs/version-0.70/_getting-started-macos-android.md @@ -81,7 +81,7 @@ export PATH=$PATH:$ANDROID_SDK_ROOT/emulator export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools ``` -Run `source $HOME/.zprofile` (or `source $HOME/.bash_profile` for `bash`) to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. +Run `source ~/.zprofile` (or `source ~/.bash_profile` for `bash`) to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. > Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Preferences" dialog, under **Appearance & Behavior** → **System Settings** → **Android SDK**. From d2eab7d8455c034a26cd7d1d05d1eab70587ee62 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Tue, 4 Oct 2022 14:11:22 +0200 Subject: [PATCH 4/5] Edit file in /docs --- docs/_getting-started-macos-android.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/_getting-started-macos-android.md b/docs/_getting-started-macos-android.md index fd52291bab0..eada9f7e420 100644 --- a/docs/_getting-started-macos-android.md +++ b/docs/_getting-started-macos-android.md @@ -73,7 +73,7 @@ Finally, click "Apply" to download and install the Android SDK and related build The React Native tools require some environment variables to be set up in order to build apps with native code. -Add the following lines to your `$HOME/.bash_profile` or `$HOME/.bashrc` (if you are using `zsh` then `~/.zprofile` or `~/.zshrc`) config file: +Add the following lines to your `~/.zprofile` or `~/.zshrc` (if you are using `bash`, then `~/.bash_profile` or `~/.bashrc`) config file: ```shell export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk @@ -81,9 +81,7 @@ export PATH=$PATH:$ANDROID_SDK_ROOT/emulator export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools ``` -> `.bash_profile` is specific to `bash`. If you're using another shell, you will need to edit the appropriate shell-specific config file. - -Type `source $HOME/.bash_profile` for `bash` or `source $HOME/.zprofile` to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. +Run `source ~/.zprofile` (or `source ~/.bash_profile` for `bash`) to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. > Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Preferences" dialog, under **Appearance & Behavior** → **System Settings** → **Android SDK**. From a8b892be95ac7add820f2fb023c04bb7b0ec2a48 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Tue, 4 Oct 2022 14:12:16 +0200 Subject: [PATCH 5/5] Revert change to versioned docs --- .../version-0.70/_getting-started-macos-android.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website/versioned_docs/version-0.70/_getting-started-macos-android.md b/website/versioned_docs/version-0.70/_getting-started-macos-android.md index eada9f7e420..fd52291bab0 100644 --- a/website/versioned_docs/version-0.70/_getting-started-macos-android.md +++ b/website/versioned_docs/version-0.70/_getting-started-macos-android.md @@ -73,7 +73,7 @@ Finally, click "Apply" to download and install the Android SDK and related build The React Native tools require some environment variables to be set up in order to build apps with native code. -Add the following lines to your `~/.zprofile` or `~/.zshrc` (if you are using `bash`, then `~/.bash_profile` or `~/.bashrc`) config file: +Add the following lines to your `$HOME/.bash_profile` or `$HOME/.bashrc` (if you are using `zsh` then `~/.zprofile` or `~/.zshrc`) config file: ```shell export ANDROID_SDK_ROOT=$HOME/Library/Android/sdk @@ -81,7 +81,9 @@ export PATH=$PATH:$ANDROID_SDK_ROOT/emulator export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools ``` -Run `source ~/.zprofile` (or `source ~/.bash_profile` for `bash`) to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. +> `.bash_profile` is specific to `bash`. If you're using another shell, you will need to edit the appropriate shell-specific config file. + +Type `source $HOME/.bash_profile` for `bash` or `source $HOME/.zprofile` to load the config into your current shell. Verify that ANDROID_SDK_ROOT has been set by running `echo $ANDROID_SDK_ROOT` and the appropriate directories have been added to your path by running `echo $PATH`. > Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Preferences" dialog, under **Appearance & Behavior** → **System Settings** → **Android SDK**.