Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

3 files changed, 40 insertions, 17 deletions

diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md
index 78bfb6844..c6fe396b8 100644
--- a/plugins/react-native/README.md
+++ b/plugins/react-native/README.md
@@ -1,14 +1,26 @@
-# React Native 
+# React Native plugin
 
-**Maintainer:** [BilalBudhani](https://github.com/BilalBudhani)
+This plugin adds completion for [`react-native`](https://facebook.github.io/react-native/).
+It also defines a few [aliases](#aliases) for the commands more frequently used.
 
-### List of Aliases
+To enable, add `react-native` to your `plugins` array in your zshrc file:
 
-Alias | React Native command
-------|---------------------
-**rnand** | *react-native run-android*
-**rnios** | *react-native run-ios*
-**rnios4s** | *react-native run-ios --simulator "iPhone 4s"*
-**rnios5** | *react-native run-ios --simulator "iPhone 5"*
-**rnios5s** | *react-native run-ios --simulator "iPhone 5s"*
+```zsh
+plugins=(... react-native)
+```
 
+## Aliases
+
+| Alias       | React Native command                           |
+|:------------|:-----------------------------------------------|
+| **rn**      | `react-native`                                 |
+| **rns**     | `react-native start`                           |
+| **rnlink**  | `react-native link`                            |
+| _App testing_                                                |
+| **rnand**   | `react-native run-android`                     |
+| **rnios**   | `react-native run-ios`                         |
+| **rnios4s** | `react-native run-ios --simulator "iPhone 4s"` |
+| **rnios5**  | `react-native run-ios --simulator "iPhone 5"`  |
+| **rnios5s** | `react-native run-ios --simulator "iPhone 5s"` |
+| **rnios6**  | `react-native run-ios --simulator "iPhone 6"`  |
+| **rnios6s** | `react-native run-ios --simulator "iPhone 6s"` |
diff --git a/plugins/react-native/_react-native b/plugins/react-native/_react-native
index 47ee8c370..893ac040a 100644
--- a/plugins/react-native/_react-native
+++ b/plugins/react-native/_react-native
@@ -3,12 +3,21 @@
 
 local -a _1st_arguments
 _1st_arguments=(
+    'init:<ProjectName> generates a new project and installs its dependencies'
+    'android:creates an empty android project'
     'start:starts the webserver'
-    'bundle:builds the javascript bundle for offline use'
-    'new-library:generates a native library bridge'
-    'android:generates an Android project for your app'
+    'run-ios:builds your app and starts it on iOS simulator'
     'run-android:builds your app and starts it on a connected Android emulator or device'
-    'upgrade:upgrade your apps template files to the latest version; run this after updating the react-native version in your package.json and running npm install'
+    'new-library:generates a native library bridge'
+    'bundle:builds the javascript bundle for offline use'
+    'unbundle:builds javascript as "unbundle" for offline use'
+    'link:[options] <packageName> links all native dependencies'
+    'unlink:[options] <packageName> unlink native dependency'
+    'install:[options] <packageName> install and link native dependencies'
+    'uninstall:[options] <packageName> uninstall and unlink native dependencies'
+    "upgrade:upgrade your app's template files to the latest version; run this after updating the react-native version in your package.json and running npm install"
+    'log-android:starts adb logcat'
+    'log-ios:starts iOS device syslog tail'
 )
 
 
diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index f19cba820..892a31fbe 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -1,9 +1,11 @@
+alias rn='react-native'
+alias rns='react-native start'
+alias rnlink='react-native link'
+
 alias rnand='react-native run-android'
+alias rnios='react-native run-ios'
 alias rnios4s='react-native run-ios --simulator "iPhone 4s"'
 alias rnios5='react-native run-ios --simulator "iPhone 5"'
 alias rnios5s='react-native run-ios --simulator "iPhone 5s"'
 alias rnios6='react-native run-ios --simulator "iPhone 6"'
 alias rnios6s='react-native run-ios --simulator "iPhone 6s"'
-alias rnios='react-native run-ios'
-alias rnlink='react-native link'
-