Bug corrections.

bootstrap/coriolis2.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
- scriptPath="${BASH_SOURCE[0]}";
+ scriptPath="$0"
  
- if [ -h "${scriptPath}" ] then
+ if [ -h "${scriptPath}" ]; then
    while [ -h "${scriptPath}" ];  do scriptPath=`readlink "${scriptPath}"`; done
  fi
  
@@ -12,6 +12,7 @@
  popd  > /dev/null
  
  coriolisEnvPy="${sysconfDir}/coriolisEnv.py"
+ echo $coriolisEnvPy
 
  if [ -e ${coriolisEnvPy} ]; then
    eval "`${coriolisEnvPy} --v2 --release --shared --python`"

bootstrap/coriolisEnv.py

@@ -131,19 +131,20 @@ fi
 
   elif coriolisVersion == 2:
 
+    buildDir  = buildType + "." + linkType
     scriptDir = os.path.dirname ( os.path.abspath(__file__) )
+    print "echo %s;" % scriptDir
     if scriptDir == "/etc/coriolis2":
       coriolisTop  = "/usr"
       sysconfDir   = scriptDir
       shellMessage = "Using system-wide Coriolis 2 (/usr)"
-    elif scriptDir == "/asim/coriolis2":
-      coriolisTop  = scriptDir
-      sysconfDir   = scriptDir + "/etc/coriolis2"
+    elif scriptDir == "/asim/coriolis2/etc/coriolis2":
+      coriolisTop  = "/asim/coriolis2"
+      sysconfDir   = scriptDir
       shellMessage = "Using SoC network-wide Coriolis 2 (/asim/coriolis2)"
     else:
       if not rootDir:
         rootDir = os.getenv("HOME") + "/coriolis-2.x"
-      buildDir     = buildType + "." + linkType
       coriolisTop  = "%s/%s/%s/install" % ( rootDir, osType, buildDir )
       sysconfDir   = coriolisTop + "/etc/coriolis2"
       shellMessage = "Using user-selected Coriolis 2 (%s)" % rootDir