diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py index 535e8dd7..69e8c117 100755 --- a/bootstrap/coriolisEnv.py +++ b/bootstrap/coriolisEnv.py @@ -183,10 +183,15 @@ if __name__ == "__main__": coriolisTop = "/usr" sysconfDir = scriptDir shellMessage = "Using system-wide Coriolis 2 (/usr)" - elif scriptDir.startswith("/etc/coriolis2"): + elif scriptDir.startswith("/opt/rh/devtoolset-2/root/etc/coriolis2"): coriolisTop = "/opt/rh/devtoolset-2/root/usr" sysconfDir = scriptDir shellMessage = "Using system-wide devtoolset-2 Coriolis 2 (/opt/rh/devtoolset-2/root/usr)" + elif scriptDir.startswith(os.getenv["HOME"]+"/nightly/coriolis-2.x/"): + rootDir = os.getenv("HOME") + "/nightly/coriolis-2.x" + coriolisTop = "%s/%s/%s/install" % ( rootDir, osType, buildDir ) + sysconfDir = scriptDir + shellMessage = "Using Nightly build Coriolis 2 (%s)" % coriolisTop elif scriptDir.startswith("/users/outil/coriolis/coriolis-2.x/") \ or scriptDir.startswith("/soc/coriolis2/"): coriolisTop = "/soc/coriolis2"