@@ -1,3 +1,8 @@

+### 3.6.6

+

+* fix a few regressions

+

+

 ### 3.6.5

 * remove superflous set_build_needed

@@ -31,7 +31,7 @@

 #

 MULLE_EXECUTABLE_VERSION_MAJOR=3

 MULLE_EXECUTABLE_VERSION_MINOR=6

-MULLE_EXECUTABLE_VERSION_PATCH=5

+MULLE_EXECUTABLE_VERSION_PATCH=6

 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"

@@ -133,9 +133,9 @@ array_insert()

 # DEBUG code

 #   [ -z "${i}" ] && internal_fail "empty index"

 #

-#   local n

+   local n

 #

-#   n="`array_count "${array}"`"

+   n="`array_count "${array}"`"

 #   [ "$i" -gt "$n" ] && internal_fail "index ${i} out of bounds ${n}"

    head_count="$i"

@@ -405,6 +405,8 @@ clean_main()

 {

    log_debug "::: clean :::"

+   local ROOT_DIR="`pwd -P`"

+

    local MINION_NAME

    [ -z "${MULLE_BOOTSTRAP_SETTINGS_SH}" ]        && . mulle-bootstrap-settings.sh

@@ -1050,7 +1050,7 @@ get_old_stashdir()

       dstdir="${dstdir#$oldprefix/}"

    fi

-   oldstashdir="`computed_stashdir "${url}" "${name}" "${dstdir}"`"

+   oldstashdir="`computed_stashdir "${name}" "${dstdir}"`"

    echo "${oldstashdir}"

 }

@@ -31,6 +31,7 @@

 #

 [ ! -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ] && echo "double inclusion of functions" >&2 && exit 1

+

 MULLE_BOOTSTRAP_FUNCTIONS_SH="included"

 MULLE_BOOTSTRAP_FUNCTIONS_VERSION_MINOR="5"

@@ -341,7 +342,6 @@ expand_environment_variables()

 }

-

 # ####################################################################

 #                             Path handling

 # ####################################################################

@@ -454,17 +454,6 @@ canonicalize_path()

    fi

 }

-#

-# canonicalizes existing paths

-# fails for files / directories that do not exist

-#

-realpath()

-{

-   [ -e "$1" ] || fail "only use realpath on existing files ($1)"

-

-   canonicalize_path "`resolve_symlinks "$1"`"

-}

-

 # ----

 # stolen from: https://stackoverflow.com/questions/2564634/convert-absolute-path-into-relative-path-given-a-current-directory-using-bash

@@ -1087,7 +1076,6 @@ mkdir_if_missing()

 }

-

 dir_is_empty()

 {

    [ -z "$1" ] && internal_fail "empty path"

@@ -1188,6 +1176,56 @@ remove_file_if_present()

    fi

 }

+# ####################################################################

+#                        Symbolic Links

+# ####################################################################

+#

+

+#

+# stolen from:

+# http://stackoverflow.com/questions/1055671/how-can-i-get-the-behavior-of-gnus-readlink-f-on-a-mac

+# ----

+#

+_prepend_path_if_relative()

+{

+   case "$2" in

+      /*)

+         echo "$2"

+      ;;

+

+      *)

+         echo "$1/$2"

+      ;;

+   esac

+}

+

+

+resolve_symlinks()

+{

+   local dir_context

+   local path

+

+   path="`readlink "$1"`"

+   if [ $? -eq 0 ]

+   then

+      dir_context=`dirname -- "$1"`

+      resolve_symlinks "`_prepend_path_if_relative "$dir_context" "$path"`"

+   else

+      echo "$1"

+   fi

+}

+

+#

+# canonicalizes existing paths

+# fails for files / directories that do not exist

+#

+realpath()

+{

+   [ -e "$1" ] || fail "only use realpath on existing files ($1)"

+

+   canonicalize_path "`resolve_symlinks "$1"`"

+}

+

 #

 # the target of the symlink must exist

 #

@@ -1208,7 +1246,6 @@ create_symlink()

    srcname="`basename -- ${url}`"

    directory="`dirname -- "${stashdir}"`"

-   directory="`realpath "${directory}"`"  # resolve symlinks

    mkdir_if_missing "${directory}"

@@ -803,11 +803,9 @@ path_relative_to_root_dir()

 computed_stashdir()

 {

-   local url="$1"

-   local name="$2"

-   local dstdir="$3"

+   local name="$1"

+   local dstdir="$2"

-   name="`_canonical_clone_name "${url}"`"

    if is_minion_bootstrap_project "${name}"

    then

       dstdir="${name}"

@@ -848,6 +846,9 @@ parse_raw_clone()

 process_raw_clone()

 {

    name="`_canonical_clone_name "${url}"`"

+

+   # memo this is done in .auto already

+   # stashdir="`computed_stashdir "${name}" "${dstdir}"`"

 }

@@ -874,7 +875,7 @@ parse_clone()

    local dstdir

-   parse_raw_clone "$1"

+   parse_raw_clone "${clone}"

    process_raw_clone

    stashdir="${dstdir}"

@@ -889,6 +890,13 @@ parse_clone()

       log_trace2 "STASHDIR: \"${stashdir}\""

    fi

+   # this is done  during auto already

+   # case "${stashdir}" in

+   #    ..*|~*|/*)

+   #     fail "dstdir \"${dstdir}\" is invalid ($clone)"

+   #    ;;

+   # esac

+

    [ -z "${url}" ]      && internal_fail "url is empty ($clone)"

    [ -z "${name}" ]     && internal_fail "name is empty ($clone)"

    [ -z "${stashdir}" ] && internal_fail "stashdir is empty ($clone)"

@@ -952,6 +960,8 @@ read_repository_file()

    local branch

    local scm

    local tag

+   local name

+

    IFS="

 "

@@ -960,6 +970,7 @@ read_repository_file()

       IFS="${DEFAULT_IFS}"

       parse_raw_clone "${clone}"

+      process_raw_clone

       case "${url}" in

          */\.\./*|\.\./*|*/\.\.|\.\.)

@@ -981,9 +992,14 @@ read_repository_file()

          dstdir=""

       fi

-      dstdir="`computed_stashdir "${url}" "${name}" "${dstdir}"`"

+      dstdir="`computed_stashdir "${name}" "${dstdir}"`"

       scm="${scm:-git}"

+      if [ "${MULLE_FLAG_LOG_MERGE}" = "YES" ]

+      then

+         log_trace "${url};${dstdir};${branch};${scm};${tag}"

+      fi

+

       echo "${url};${dstdir};${branch};${scm};${tag}"

    done

@@ -1309,6 +1325,7 @@ mulle_repositories_initialize()

    log_debug ":mulle_repositories_initialize:"

+   [ -z "${MULLE_BOOTSTRAP_LOCAL_ENVIRONMENT_SH}" ]  && . mulle-bootstrap-local-environment.sh

    [ -z "${MULLE_BOOTSTRAP_ARRAY_SH}" ]           && . mulle-bootstrap-array.sh

    [ -z "${MULLE_BOOTSTRAP_SETTINGS_SH}" ]        && . mulle-bootstrap-settings.sh

    [ -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ]       && . mulle-bootstrap-functions.sh

@@ -176,7 +176,7 @@ show_raw_repository()

    local stashdir

    name="`_canonical_clone_name "${url}"`"

-   stashdir="`computed_stashdir "${url}" "${name}" "${dstdir}"`"

+   stashdir="`computed_stashdir "${name}" "${dstdir}"`"

    (

       printf "%b" "${SHOW_PREFIX}${url}"

@@ -1,4 +1,7 @@

-#! /bin/sh -e

+#! /usr/bin/env bash

+

+set -e 

+set -x

 . mulle-bootstrap-dependency-resolve.sh

 . mulle-bootstrap-functions.sh

@@ -1,10 +1,11 @@

 #! /bin/sh

+

 . mulle-bootstrap-logging.sh

 . mulle-bootstrap-repositories.sh

 . mulle-bootstrap-fetch.sh

-

+set -x

 run_test_1()

 {

@@ -46,8 +47,6 @@ MULLE_FLAG_LOG_VERBOSE="YES"

 rm -rf deep 2> /dev/null

-set -e

-set -x

 run_test_1

 rm -rf deep 2> /dev/null

@@ -31,33 +31,21 @@ run_test_2()

    local tag

    local stashdir

-   parse_clone "url/name;;;;"

+   parse_clone "url/name;whatever;;;"

    [ "${url}"      = "url/name" ]  || fail "wrong name \"${url}\""

    [ "${name}"     = "name" ]      || fail "wrong name \"${name}\""

-   [ "${stashdir}" = "stashes/name" ]  || fail "wrong stashdir \"${stashdir}\""

-   [ "${branch}"   = "" ]       || fail "wrong branch \"${branch}\""

-   [ "${tag}"      = "" ]       || fail "wrong tag \"${tag}\""

-   [ "${scm}"      = "" ]       || fail "wrong scm \"${scm}\""

+   [ "${stashdir}" = "whatever" ]  || fail "wrong stashdir \"${stashdir}\""

+   [ "${branch}"   = "" ]          || fail "wrong branch \"${branch}\""

+   [ "${tag}"      = "" ]          || fail "wrong tag \"${tag}\""

+   [ "${scm}"      = "" ]          || fail "wrong scm \"${scm}\""

 }

-run_test_3()

-{

-   local name

-   local url

-   local branch

-   local scm

-   local tag

-   local stashdir

-   echo "The next test should fail" >&2

-   parse_clone "url/name;../foo;;;" || exit 1

-   echo "If you see this the test is broken" >&2

-}

+ROOT_DIR="`pwd`"

 run_test_1

 run_test_2

-run_test_3

 echo "test finished" >&2

@@ -82,6 +82,8 @@ run_test_2()

    [ "${fclone}" = "${clone}" ] || fail "failed to remember clone"

 }

+ROOT_DIR="`pwd`"

+

 rm -rf .bootstrap.repos

 run_test_1

 run_test_2