Browse code

Fix some horrible bugs (see RELEASENOTES.md)

Nat! authored on 25-02-2016 18:20:44
Showing 6 changed files
... ...
@@ -80,7 +80,7 @@ echo "YES" > .bootstrap/settings/{reponame}/proper_skip_install
80 80
 ```
81 81
 
82 82
 
83
-### I changed something in .bootstrap but it nothing happens ?
83
+### I changed something in .bootstrap but nothing happens ?
84 84
 
85 85
 This can happen, when a .bootstrap.auto was created. The easy solution
86 86
 is to say `mulle-bootstrap clean dist`.
... ...
@@ -154,8 +154,3 @@ mulle-bootstrap -t
154 154
 ```
155 155
 
156 156
 
157
-### Can I get some help ?
158
-
159
-Try http://stackoverflow.com and create a question with the tag "mulle-bootstrap".
160
-I am subscribed to that and should get an email.
161
-
... ...
@@ -1,3 +1,8 @@
1
+0.16
2
+===
3
+   Fixed misnamed exekutor.
4
+   Fix old favorite bug build_ignore became a directory bug) again ...
5
+
1 6
 0.15
2 7
 ===
3 8
    `tag` checks in all repositories, that a tag does not exist.
... ...
@@ -1,3 +1,3 @@
1 1
 Use different build dir than just build.
2 2
 Write "doctor" command to find common problems.
3
-Check that files in .auto aren't older than  in .bootstrap.
3
+
... ...
@@ -5,7 +5,7 @@
5 5
 PROJECT=MulleBootstrap
6 6
 TARGET=mulle-bootstrap
7 7
 HOMEPAGE="http://www.mulle-kybernetik.com/software/git/${TARGET}"
8
-DESC="A simple shell script based dependency manager for projects"
8
+DESC="A shell script based dependency manager for projects"
9 9
 
10 10
 VERSION="${1:-`./mulle-bootstrap version`}"
11 11
 [ $# -eq 0 ] || shift
... ...
@@ -29,7 +29,7 @@
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 
32
-VERSION=0.15
32
+VERSION=0.16
33 33
 
34 34
 #
35 35
 # This is the main user interface to mulle-bootstrap
... ...
@@ -427,7 +427,7 @@ bootstrap_auto_update()
427 427
    # now move it
428 428
    if [ -d "${BOOTSTRAP_SUBDIR}.auto" ]
429 429
    then
430
-      executor rm -rf  "${BOOTSTRAP_SUBDIR}.auto"
430
+      exekutor rm -rf  "${BOOTSTRAP_SUBDIR}.auto"
431 431
    fi
432 432
    exekutor mv "${BOOTSTRAP_SUBDIR}.tmp" "${BOOTSTRAP_SUBDIR}.auto" || exit 1
433 433
 
... ...
@@ -440,6 +440,8 @@ bootstrap_auto_update()
440 440
    local dstfile
441 441
    local i
442 442
    local settingname
443
+   local directory
444
+
443 445
    IFS="
444 446
 "
445 447
    for i in $INHERIT_SETTINGS
... ...
@@ -448,11 +450,13 @@ bootstrap_auto_update()
448 450
       srcfile="${dir}/.bootstrap/${i}"
449 451
       dstfile="${BOOTSTRAP_SUBDIR}.auto/${i}"
450 452
       settingname="`basename -- "${i}"`"
453
+
451 454
       if [ -f "${srcfile}" ]
452 455
       then
453 456
          log_fluff "Inheriting \"${settingname}\" from \"${srcfile}\""
454 457
 
455
-         mkdir_if_missing "${BOOTSTRAP_SUBDIR}.auto/`dirname -- "${i}"`"
458
+         directory="`dirname -- "${i}"`"
459
+         mkdir_if_missing "${BOOTSTRAP_SUBDIR}.auto/${directory}"
456 460
          if [ -f "${BOOTSTRAP_SUBDIR}.auto/${i}" ]
457 461
          then
458 462
             local tmpfile
... ...
@@ -487,7 +491,7 @@ bootstrap_auto_update()
487 491
 
488 492
       log_fluff "Link up build settings of \"${name}\" to \"${BOOTSTRAP_SUBDIR}.auto/settings/${name}\""
489 493
 
490
-      mkdir_if_missing "${BOOTSTRAP_SUBDIR}.auto/settings/${name}"
494
+      mkdir_if_missing "${BOOTSTRAP_SUBDIR}.auto/settings"
491 495
       exekutor find "${dir}/.bootstrap/settings" -xdev -mindepth 1 -maxdepth 1 -type f -print0 | \
492 496
          exekutor xargs -0 -I % ln -s -f "${relative}/../../"% "${BOOTSTRAP_SUBDIR}.auto/settings/${name}"
493 497