Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0528180f authored by Bob Badour's avatar Bob Badour Committed by Gerrit Code Review
Browse files

Merge "Fix bug caused by set -e"

parents 7b67b9e9 455b3cb3

scripts/transitive-deps.sh

+6 −0
Original line number Original line Diff line number Diff line
@@ -377,7 +377,9 @@ while [ $(wc -l < "${newDeps}") -gt 0 ]; do 
        depth=$(expr ${depth} + 1)

        depth=$(expr ${depth} + 1)

    fi

    fi

    ( # recalculate dependencies by combining unique inputs of new deps w. old

    ( # recalculate dependencies by combining unique inputs of new deps w. old

        set +e

        sh -c "${filter}" < "${newDeps}" | cut -d\  -f3- | getDeps

        sh -c "${filter}" < "${newDeps}" | cut -d\  -f3- | getDeps

        set -e

        cat "${oldDeps}"

        cat "${oldDeps}"

    ) | sort -u > "${allDeps}"

    ) | sort -u > "${allDeps}"

    # recalculate new dependencies as net additions to old dependencies

    # recalculate new dependencies as net additions to old dependencies
@@ -433,7 +435,9 @@ if [ -n "${projects_out}" ] \ 
  || [ -n "${notices_out}" ]

  || [ -n "${notices_out}" ]

then

then

    readonly allProj="${tmpFiles}/projects"

    readonly allProj="${tmpFiles}/projects"

    set +e

    egrep -v '^out[/]' "${allDirs}" | getProjects > "${allProj}"

    egrep -v '^out[/]' "${allDirs}" | getProjects > "${allProj}"

    set -e

    if ${showProgress}; then

    if ${showProgress}; then

        echo $(wc -l < "${allProj}")" projects" >&2

        echo $(wc -l < "${allProj}")" projects" >&2

    fi

    fi
@@ -450,7 +454,9 @@ case "${notices_out}" in 
  '')        : do nothing;;

  '')        : do nothing;;

  *)

  *)

    readonly allNotice="${tmpFiles}/notices"

    readonly allNotice="${tmpFiles}/notices"

    set +e

    egrep '^1' "${allDeps}" | cut -d\  -f3- | egrep -v '^out/' > "${allNotice}"

    egrep '^1' "${allDeps}" | cut -d\  -f3- | egrep -v '^out/' > "${allNotice}"

    set -e

    cat "${allProj}" | while read proj; do

    cat "${allProj}" | while read proj; do

        for f in LICENSE LICENCE NOTICE license.txt notice.txt; do

        for f in LICENSE LICENCE NOTICE license.txt notice.txt; do

            if [ -f "${proj}/${f}" ]; then

            if [ -f "${proj}/${f}" ]; then