From ac216c2fe54215ed6147553826fa1348d5a90ba2 Mon Sep 17 00:00:00 2001 From: shuky Date: Mon, 24 Feb 2014 16:56:56 +0200 Subject: [PATCH] Support non rvm ruby --- debugger/ruby_imp/ruby_debugger_connector.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debugger/ruby_imp/ruby_debugger_connector.py b/debugger/ruby_imp/ruby_debugger_connector.py index 3d1f650..fac2bec 100644 --- a/debugger/ruby_imp/ruby_debugger_connector.py +++ b/debugger/ruby_imp/ruby_debugger_connector.py @@ -47,8 +47,8 @@ def validation_environment(self): try: if os.name == "posix": # On Unix using rvm and bash - rvm_load = "[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && source \"$HOME/.rvm/scripts/rvm\"" - validate_command = rvm_load + " && exec ruby '" + PathHelper.get_ruby_version_discoverer()+"'" + rvm_load = "[[ -s \"$HOME/.rvm/scripts/rvm\" ]] 2> /dev/null ; source \"$HOME/.rvm/scripts/rvm\" 2> /dev/null" + validate_command = rvm_load + " ; exec ruby '" + PathHelper.get_ruby_version_discoverer()+"'" self.ruby_version = subprocess.Popen(["bash", "-c", validate_command], stdout=subprocess.PIPE).communicate()[0].splitlines() else: # On Windows not using shell, so the proces is not visible to the user @@ -80,8 +80,8 @@ def start_process(self, current_directory, file_name, args): # Initialize params acourding to OS type if os.name == "posix": # On Unix using exec and shell to get environemnt variables of ruby version - rvm_load = "[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && source \"$HOME/.rvm/scripts/rvm\"" - process_command = rvm_load + " && exec ruby"+directory+requires+program + rvm_load = "[[ -s \"$HOME/.rvm/scripts/rvm\" ]] 2> /dev/null; source \"$HOME/.rvm/scripts/rvm\" 2> /dev/null" + process_command = rvm_load + " ; exec ruby"+directory+requires+program process_params = ["bash", "-c", "\""+process_command+"\""] self.process = subprocess.Popen(" ".join(process_params), stdin = subprocess.PIPE, stderr = subprocess.PIPE, stdout=subprocess.PIPE, bufsize=1, shell=True, cwd=sublime.active_window().folders()[0]) else: