Changeset 712:e88cfddf8df3

Timestamp:

12/24/08 13:59:28 (3 years ago)

Author:

mitsuhiko

Branch:

default

Message:

Fixed bugs in new installer.

Files:

• Makefile.in (modified) (1 diff)
• scripts/_install-posix.py (modified) (7 diffs)

Makefile.in

@@ -8 +8 @@
 
 install:
-        @($(PYTHON) scripts/install-posix $(PREFIX))
+        @($(PYTHON) scripts/_install-posix.py $(PREFIX))
 
 uninstall:

scripts/_install-posix.py

@@ -11 +11 @@
 import sys
 import os
+import shutil
 from subprocess import call as run
-from glob import glob
 
 
@@ -22 +22 @@
 
 
+def silent(f, *args):
+    try:
+        return f(*args)
+    except:
+        pass
+
+
 def copy_folder(src, dst, recurse=True):
     if recurse:
         shutil.copytree(src, dst)
     else:
-        for filename in os.path.listdir(src):
-            filename = join(src, dst)
+        for filename in os.listdir(src):
+            filename = join(src, filename)
             if os.path.isfile(filename):
                 shutil.copy2(filename, dst)
@@ -34 +41 @@
 def copy_servers(source, destination, lib_dir, python):
     silent(os.makedirs, destination)
-    for filename in os.path.listdir(source):
+    for filename in os.listdir(source):
         f = file(join(source, filename))
         try:
@@ -61 +68 @@
     finally:
         f.close()
-    f = file(join(destination, filename), 'w')
+    f = file(join(destination, '_init_zine.py'), 'w')
     try:
         f.write(contents)
@@ -72 +79 @@
 def main(prefix):
     python = sys.executable
-    source = os.path.abspath('..')
+    source = os.path.abspath('.')
     zine_source = join(source, 'zine')
     lib_dir = join(prefix, 'lib', 'zine')
@@ -87 +94 @@
     copy_folder(zine_source, join(lib_dir, 'zine'),
                 recurse=False)
-    for package in packages:
+    for package in PACKAGES:
         copy_folder(join(zine_source, package),
                     join(lib_dir, 'zine', package))
@@ -116 +123 @@
 
 if __name__ == '__main__':
-    if len(sys.args) != 2:
+    if len(sys.argv) != 2:
         print >> sys.stderr, 'error: install script only accepts a prefix'
         sys.exit(1)
-    main(sys.args[1])
+    os.chdir(os.path.join(os.path.dirname(__file__), '..'))
+    main(sys.argv[1])