Convert ad hoc shell calls to singleton instance; fix upgrade bug.

[wizard.git] / wizard / command / install.py

diff --git a/wizard/command/install.py b/wizard/command/install.py
index a4faf83db6963e1280d8f820b21483ebf65808da..4ae9058a3880953f3568fb41c57a7c9158fb90f5 100644 (file)
--- a/wizard/command/install.py
+++ b/wizard/command/install.py
@@ -40,13 +40,12 @@ Autoinstalls the application %s in the directory DIR.""" % (appname, appname))
     else:
         ihandler.ask(options)
 
-    sh = shell.Shell()
     input.infobox("Copying files (this may take a while)...")
     if not os.path.exists(dir):
-        sh.call("git", "clone", "-q", "--shared", application.repository(old_options.srv_path), dir)
+        shell.call("git", "clone", "-q", "--shared", application.repository(old_options.srv_path), dir)
     with util.ChangeDirectory(dir):
         if not old_options.retry and version and version != "head-scripts": # for ease in testing
-            sh.call("git", "reset", "-q", "--hard", appstr)
+            shell.call("git", "reset", "-q", "--hard", appstr)
         input.infobox("Installing...")
         application.install(distutils.version.LooseVersion(version), options)
         if not old_options.no_commit: