summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-06 23:44:32 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-06 23:44:32 +0100
commitb0541215b118232306de1cc13de4700f50a06dc5 (patch)
tree88f57e6929157a390cbaf12bdfcf97b1a8737e64
parent34637b79b97c154b9f16abf5b67d7d844b93e18f (diff)
More PATH tweaks.
-rwxr-xr-xcdist4
1 files changed, 2 insertions, 2 deletions
diff --git a/cdist b/cdist
index ec03a2e..998570e 100755
--- a/cdist
+++ b/cdist
@@ -262,7 +262,7 @@ class RemoteEnvironment(Environment):
self.set('CXXFLAGS', '"-I%s/include -I%s/include"' % (self.dir_on_host, OSX_ENVIRONMENT_PREFIX))
self.set('LINKFLAGS', '"-L%s/lib -L%s/lib"' % (self.dir_on_host, OSX_ENVIRONMENT_PREFIX))
self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/lib/pkgconfig' % (self.dir_on_host, OSX_ENVIRONMENT_PREFIX))
- self.set('PATH', '$PATH:/usr/local/bin:%s/bin' % OSX_ENVIRONMENT_PREFIX)
+ self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % OSX_ENVIRONMENT_PREFIX)
def work_dir_cdist(self):
return self.host_mount_dir
@@ -277,7 +277,7 @@ class RemoteEnvironment(Environment):
cwd = cwd[len(self.host_mount_dir):]
log('ssh [%s] -> %s' % (cwd, c))
- command('ssh %s -- "PATH=/usr/bin:/sbin cd %s%s; %s %s"' % (self.host, self.dir_on_host, cwd, self.variables_string(True), c))
+ command('ssh %s -- "cd %s%s; %s %s"' % (self.host, self.dir_on_host, cwd, self.variables_string(True), c))
def cleanup(self):
os.chdir('/')