4bba11dbefbb96441e28221d322df07e737239a2

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #2744 from docwhat/ostype-not-uname

Use $OSTYPE instead of uname to speed things up

Diff

 1diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
 2index 32dd4b624dfd96081f3a2d518af1d4b763089bc7..014bb15dd0ce0c79be54012a9a5add21c45433b1 100644
 3--- a/plugins/battery/battery.plugin.zsh
 4+++ b/plugins/battery/battery.plugin.zsh
 5@@ -8,7 +8,7 @@
 6 # Modified to add support for Apple Mac   #
 7 ###########################################
 8 
 9-if [[ $(uname) == "Darwin" ]] ; then
10+if [[ "$OSTYPE" = darwin* ]] ; then
11 
12   function battery_pct() {
13     local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
14diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
15index 617dcde7111f5a811f391e15c685a8c712b16dd4..ba3d3f623b3692e7d19180ca05b283a1e15678ae 100644
16--- a/plugins/bundler/bundler.plugin.zsh
17+++ b/plugins/bundler/bundler.plugin.zsh
18@@ -54,7 +54,7 @@ bundle_install() {
19   if _bundler-installed && _within-bundled-project; then
20     local bundler_version=`bundle version | cut -d' ' -f3`
21     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
22-      if [[ "$(uname)" == 'Darwin' ]]
23+      if [[ "$OSTYPE" = darwin* ]]
24       then
25         local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
26       else
27diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
28index a6d08410fc22ec33c17c65c40185551a26b14c9e..4a36b882dcac1d81fd9f17ab56b83f44e8de2639 100644
29--- a/plugins/jira/jira.plugin.zsh
30+++ b/plugins/jira/jira.plugin.zsh
31@@ -12,7 +12,7 @@
32 #        jira ABC-123   # Opens an existing issue
33 open_jira_issue () {
34   local open_cmd
35-  if [[ $(uname -s) == 'Darwin' ]]; then
36+  if [[ "$OSTYPE" = darwin* ]]; then
37     open_cmd='open'
38   else
39     open_cmd='xdg-open'
40diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
41index 2d78f2b4c45a138333cb907ebf26fe9b30a0de3a..39d8b10d99324b60c6b01155ac8b9401b4b57aa0 100644
42--- a/plugins/node/node.plugin.zsh
43+++ b/plugins/node/node.plugin.zsh
44@@ -3,7 +3,7 @@
45 function node-docs {
46   # get the open command
47   local open_cmd
48-  if [[ $(uname -s) == 'Darwin' ]]; then
49+  if [[ "$OSTYPE" = darwin* ]]; then
50     open_cmd='open'
51   else
52     open_cmd='xdg-open'
53diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
54index cb84f69a14943e012d872d4d8b6cec0a29ecf81c..cfc9a079f2060ef604d02c35cdf22d378090e011 100644
55--- a/plugins/rake-fast/rake-fast.plugin.zsh
56+++ b/plugins/rake-fast/rake-fast.plugin.zsh
57@@ -10,7 +10,7 @@ _rake_refresh () {
58 _rake_does_task_list_need_generating () {
59   if [ ! -f .rake_tasks ]; then return 0;
60   else
61-    if [[ $(uname -s) == 'Darwin' ]]; then
62+    if [[ "$OSTYPE" = darwin* ]]; then
63       accurate=$(stat -f%m .rake_tasks)
64       changed=$(stat -f%m Rakefile)
65     else
66diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
67index 438f386fb394b0c6dedf11125c23695488db5c7e..5acc75cc75dc760ce170c5c9200712e601e03a88 100644
68--- a/plugins/sublime/sublime.plugin.zsh
69+++ b/plugins/sublime/sublime.plugin.zsh
70@@ -17,7 +17,7 @@ if [[ $('uname') == 'Linux' ]]; then
71         fi
72     done
73 
74-elif  [[ $('uname') == 'Darwin' ]]; then
75+elif  [[ "$OSTYPE" = darwin* ]]; then
76     local _sublime_darwin_paths > /dev/null 2>&1
77     _sublime_darwin_paths=(
78         "/usr/local/bin/subl"
79diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
80index e157a389d3371ccda540ae3ee507406c60ba7a5c..371e3a303189793797c1a65e404f28d2c76ae14d 100644
81--- a/plugins/web-search/web-search.plugin.zsh
82+++ b/plugins/web-search/web-search.plugin.zsh
83@@ -3,7 +3,7 @@
84 function web_search() {
85   # get the open command
86   local open_cmd
87-  if [[ $(uname -s) == 'Darwin' ]]; then
88+  if [[ "$OSTYPE" = darwin* ]]; then
89     open_cmd='open'
90   else
91     open_cmd='xdg-open'