No point in passing commands dir to devbot

3 files changed, 7 insertions, 4 deletions

diff --git a/commands/common.py b/commands/common.py
index a5209c2..6b961bd 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -2,7 +2,6 @@ import os
 import sys
 
 base_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-tests_dir = os.path.join(base_dir, "tests")
 
 sys.path.append(base_dir)
 
@@ -19,7 +18,6 @@ def setup():
                  install_dir=install_dir,
                  source_dir=os.path.join(base_dir, "source"),
                  build_dir=os.path.join(base_dir, "build"),
-                 commands_dir=os.path.join(base_dir, "commands"),
                  state_dir=os.path.join(base_dir, "state"),
                  prefs_path=os.path.join(base_dir, "prefs"),
                  logs_dir=logs_dir,
diff --git a/commands/run-tests b/commands/run-tests
index 3f92681..d09f621 100755
--- a/commands/run-tests
+++ b/commands/run-tests
@@ -17,7 +17,7 @@ def _run_ui_tests():
     shutil.rmtree(profile_path, ignore_errors=True)
 
     virtual = "SUGAR_BUILDBOT" in os.environ
-    test_path = os.path.join(common.tests_dir, "sugar", "shell.py")
+    test_path = os.path.join(common.base_dir, "tests", "sugar", "shell.py")
 
     result = run.run_test("sugar-runner", test_path, virtual)
 
diff --git a/commands/shell b/commands/shell
index 71f3ceb..55449b8 100755
--- a/commands/shell
+++ b/commands/shell
@@ -6,6 +6,11 @@ import common
 
 from devbot import shell
 from devbot import config
+from devbot import environ
 
 common.setup()
-shell.start(os.path.join(config.commands_dir, "bashrc"))
+
+commands_dir = os.path.join(common.base_dir, "commands")
+
+environ.add_path("PATH", commands_dir)
+shell.start(os.path.join(commands_dir, "bashrc"))