Fixed bug 4537 - IceGrid/secure demoscript failure

2 files changed, 2 insertions, 19 deletions

diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index 7c0426f45f6..c643599226e 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -34,19 +34,9 @@ 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="%s"' % os.path.join(icecaPath, "bin", "iceca")
-
 print "creating certificates...",
 sys.stdout.flush()
-makecerts = Util.spawn(command)
+makecerts = Util.spawn("python -u makecerts.py")
 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:")
diff --git a/cpp/demo/IceGrid/secure/makecerts.py b/cpp/demo/IceGrid/secure/makecerts.py
index d7d969a8f94..14c1749b84b 100755
--- a/cpp/demo/IceGrid/secure/makecerts.py
+++ b/cpp/demo/IceGrid/secure/makecerts.py
@@ -10,11 +10,9 @@
 
 import os, sys, shutil, glob
 
-iceca = "iceca"
-
 def runIceca(args):
     os.environ['PYTHONUNBUFFERED'] = '1'
-    command = 'python "%s" %s' % (iceca, args)
+    command = 'iceca %s' % args
     if os.system(command):
         sys.exit(1)
 
@@ -29,12 +27,7 @@ def createCertificate(filename, cn):
     print
     print
 
-for x in sys.argv[1:]:
-    if x[0:7] == "--iceca":
-        iceca = x[8:]
-
 cwd = os.getcwd()
-
 if not os.path.exists("certs") or os.path.basename(cwd) != "secure":
     print "You must run this script from the secure demo directory"
     sys.exit(1)