From: Edward Z. Yang <ezyang@mit.edu>
Date: Mon, 28 Dec 2009 00:05:11 +0000 (-0500)
Subject: Fix broken installs if directory exists.
X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/commitdiff_plain/1eae501a8dbba4d976f6c12c8bd5103ea3f16c8e

Fix broken installs if directory exists.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
---

diff --git a/tests/mediawiki-install-test.sh b/tests/mediawiki-install-test.sh
index ed09a61..f82d947 100755
--- a/tests/mediawiki-install-test.sh
+++ b/tests/mediawiki-install-test.sh
@@ -4,4 +4,5 @@ cd `dirname $0`
 DEFAULT_HEAD=1
 TESTNAME="mediawiki_install"
 source ./setup
+mkdir "$TESTDIR"
 source ./mediawiki-install
diff --git a/tests/wordpress-install-test.sh b/tests/wordpress-install-test.sh
index 250e7ba..4745035 100755
--- a/tests/wordpress-install-test.sh
+++ b/tests/wordpress-install-test.sh
@@ -5,4 +5,5 @@ DEFAULT_HEAD=1
 TESTNAME="wordpress_install"
 source ./setup
 
+mkdir "$TESTDIR"
 source ./wordpress-install
diff --git a/wizard/command/install.py b/wizard/command/install.py
index 4ae9058..6ac1383 100644
--- a/wizard/command/install.py
+++ b/wizard/command/install.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import distutils
+import logging
 
 import wizard
 from wizard import app, command, git, prompt, shell, util
@@ -40,9 +41,11 @@ Autoinstalls the application %s in the directory DIR.""" % (appname, appname))
     else:
         ihandler.ask(options)
 
-    input.infobox("Copying files (this may take a while)...")
-    if not os.path.exists(dir):
+    if not os.path.exists(dir) or not os.listdir(dir):
+        input.infobox("Copying files (this may take a while)...")
         shell.call("git", "clone", "-q", "--shared", application.repository(old_options.srv_path), dir)
+    else:
+        logging.info("Skipped clone")
     with util.ChangeDirectory(dir):
         if not old_options.retry and version and version != "head-scripts": # for ease in testing
             shell.call("git", "reset", "-q", "--hard", appstr)