Bug fixes installing PlatformIO in macOS (Issue: #124)

gepd · Jul 3, 2017 · 0360d34 · 0360d34
1 parent e918265
commit 0360d34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/beginning/pio_install.py b/beginning/pio_install.py
@@ -152,7 +152,7 @@ def install(self):
         out = run_command(cmd, "setup_error", self.OUTPUT_PATH)
 
         # Install pio
-        if(sublime.platform() is 'osx'):
+        if(sublime.platform() == 'osx'):
             executable = path.join(self.V_ENV_BIN_PATH, self.SYMLINK)
             cmd = ['"%s"' % (executable), '-m', 'pip',
                    'install', '-U', 'platformio']

diff --git a/libraries/tools.py b/libraries/tools.py
@@ -82,9 +82,9 @@ def create_command(command):
     if(not env_path):
         return command
 
-    _os = platform()
+    os = platform()
 
-    if(_os is 'osx'):
+    if(os == 'osx'):
         exe = 'python' if(not symlink) else 'python2'
         options = ['-m', command[0]]
     else:

diff --git a/platformio/command.py b/platformio/command.py
@@ -68,7 +68,7 @@ def run_command(self, command, prepare=True):
 
     def prepare_command(self, post_command):
         cmd = " ".join(post_command)
-        command = create_command(['pio', '-f', '-c', 'sublimetext'])
+        command = create_command(['platformio', '-f', '-c', 'sublimetext'])
         command.extend(post_command)
 
         # verbose mode

diff --git a/platformio/update.py b/platformio/update.py
@@ -54,8 +54,8 @@ def update_pio(self):
         self.show_feedback()
         self.dprint("searching_pio_updates")
 
-        cmd = ['pio','upgrade']
-        out = self.run_command(cmd, prepare=False)
+        cmd = ['upgrade']
+        out = self.run_command(cmd)
 
     def update_async(self):
         """New Thread Execution
@@ -100,7 +100,7 @@ def developer_pio(self):
             self.dprint("installing_stable_pio")
             option = 'platformio'
 
-        cmd = ['pip','install', '-U', option]
+        cmd = create_command(['pip','install', '-U', option])
         out = self.run_command(cmd, prepare=False)
 
     def check_update_async(self):
@@ -178,5 +178,5 @@ def check_update(self):
                 self.show_feedback()
                 self.realtime = True
 
-                cmd = ['pio','upgrade']
-                out = self.run_command(cmd, prepare=False)
+                cmd = ['upgrade']
+                out = self.run_command(cmd)