release: 1.3.148

[lilypond.git] / scripts / update-lily.py

diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index b683bab2ffb51ff01811757e112e413d6046a7cd..49b6c8170eb066bd3e51ca801938c5ce8f0a4504 100644 (file)
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -50,8 +50,10 @@ patch_dir = build_root + '/patches'
 notify = 0
 
 build_command = '''
+set -x
 cd %b &&
 [ -d %n-%v ] && exit 1 || true;
+mkdir -p %n-%v
 (
 tar xzf %r/%t &&
 rm -f building &&
@@ -60,7 +62,7 @@ cd %n-%v &&
 ./configure --prefix=$HOME/usr && make all web
 ) >> %n-%v/log.txt 2>&1 &&
 rm -f %n &&
-ln -s %n%-%v %n
+ln -s %n-%v %n
 '''
 
 
@@ -243,7 +245,7 @@ option_definitions = [
         ),
        ('', 'h', 'help', _ ("this help")),
         ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir),
-        ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]"),
+        ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]")),
        ('', 'r', 'remove-previous', _ ("remove previous build")),
        ('', 'V', 'verbose', _ ("verbose")),
        ('', 'v', 'version', _ ("print version number")),
@@ -413,7 +415,7 @@ if 1:
        latest = find_latest (url)
 
        if os.path.isdir ('%s/%s' % (build_root, latest)):
-               progress (_ ("latest is %s") % latest)
+               progress (_ ("latest is: %s") % latest)
                progress (_ ("relax, %s is up to date" % package_name))
                sys.exit (0)
 
@@ -445,11 +447,12 @@ if 1:
 
        progress (_ ("building %s...") % latest)
        os.chdir (build_root)
-       if build (latest) previous and remove_previous_p:
-               system ('rm -rf %s' % os.path.join (build_root, previous))
+       if build (latest):
+               if previous and remove_previous_p:
+                       system ('rm -rf %s' % os.path.join (build_root, previous))
        else:
                if notify:
-                       system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify)
+                       system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify))
                sys.exit (1)
                
        os.chdir (original_dir)