1 files changed, 13 insertions, 1 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index c81348de4b0..f53a592eb38 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -34,9 +34,21 @@ if Util.defaultHost:
 else:
     args = ''
 
+icecaPath = ""
+if os.environ.get("ICE_HOME", "") != "":
+    icecaPath = os.environ["ICE_HOME"]
+elif os.path.isdir(os.path.join(path[0], "cpp")):
+    icecaPath = os.path.join(path[0], "cpp")
+
+command = 'python -u makecerts.py'
+if icecaPath != "":
+    command += " --iceca=" + os.path.join(icecaPath, "bin", "iceca")
+
+print command
+
 print "creating certificates...",
 sys.stdout.flush()
-makecerts = Util.spawn('python -u makecerts.py --iceca=' + os.path.join(Util.getIceDir("cpp"), "bin", "iceca"))
+makecerts = Util.spawn(command)
 makecerts.expect("Do you want to keep this as the CA subject name?")
 makecerts.sendline("y")
 makecerts.expect("Enter the email address of the CA:")