* stepmake/bin/install.py (dest): Only chmod/chown just created directories

* input/test/font-table.ly: new file. Generate font table within lily.

diff --git a/ChangeLog b/ChangeLog
index 377742ae4e920c9b469a1f6a4aa2a3181850e2f9..69b602e9eaf9cc85b6b2439ef2592c0176f9dd7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * stepmake/bin/install.py (dest): Only chmod/chown just created directories
+
        * Documentation/user/notation-appendices.itely (The Feta font):
        use it.
 

diff --git a/input/test/font-table.ly b/input/test/font-table.ly
index fa1a5f6f8fdcfeb2ca7425dc8cc65f16b92001fd..a21d1791414c7a247915749b7d1825a88b6d4b56 100644 (file)
--- a/input/test/font-table.ly
+++ b/input/test/font-table.ly
@@ -28,18 +28,18 @@
    0
    (1+ (min-length (cdr lst) (1- n)) )))
 
-#(define (doc-chars names)
+#(define (doc-chars names acc)
   (let*
    ((n (min-length names 2))
     (head (take names n))
     (tail (drop names n))
     )
 
-   (cons
-    (make-line-markup (map doc-char head))
-    (if (null? tail)
-     '()
-     (doc-chars tail)))))
+   (if (null? head)
+    acc
+    (doc-chars  tail
+     (cons (make-line-markup (map doc-char head)) acc)))
+     ))
 
 #(define (group-lines lines)
   (let*
@@ -56,11 +56,11 @@
                        
 #(let*
   ((lines (doc-chars
-          (ly:font-glyph-list (format  "~a/share/lilypond/~a/fonts/otf/emmentaler-20.otf"
+          (ly:font-glyph-list (format  "~a/fonts/otf/emmentaler-20.otf"
                                (getenv "LILYPONDPREFIX")
-                               (lilypond-version)
-                             ))))
-   (pages (group-lines lines)))
+                             ))
+        '()))
+   (pages (group-lines (reverse lines))))
 
   (for-each 
    (lambda (x)

diff --git a/stepmake/bin/install.py b/stepmake/bin/install.py
index 2a29e353c02453b027586fb4442fafabd66f8a2d..50cb61cd3efcbcbcfe7867c6cc34c738d248a5d8 100644 (file)
--- a/stepmake/bin/install.py
+++ b/stepmake/bin/install.py
@@ -65,7 +65,10 @@ if not create_dir:
        dest = args.pop()
 
 for f in args:
-       if create_dir and not os.path.isdir (f):
+       if create_dir:
+               if os.path.isdir (f):
+                       continue
+               
                os.makedirs (f, mode=mode)
                chown_me.append (f)
        else:
@@ -75,6 +78,7 @@ for f in args:
                        shutil.copy2 (f, dest)
                else:
                        shutil.move (f, dest)
+
                if os.path.isdir (dest):
                        chown_me.append (os.path.join (dest, os.path.basename (f)))
                else: