diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/git.sh | 16 | ||||
| -rwxr-xr-x | include/option.sh | 3 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/git.sh b/include/git.sh index 1d63f99c..274b5f3f 100755 --- a/include/git.sh +++ b/include/git.sh @@ -120,32 +120,26 @@ clone_project() git_reset_rev() { - ( - cd "${1}" || err "git_reset_rev: !cd ${1}" - git reset --hard ${2} || err "!git reset ${1} <- ${2}" + git -C "${1}" reset --hard ${2} || err "!git reset ${1} <- ${2}" if [ "${project}" != "coreboot" ] && [ "${project}" != "u-boot" ] && \ - [ -f ".gitmodules" ]; then - git submodule update --init --checkout || \ + [ -f "${1}/.gitmodules" ]; then + git -C "${1}" submodule update --init --checkout || \ err "git_reset_rev ${1}: can't download submodules" fi - ) || err "git reset fail" } git_am_patches() { sdir="${1}" # assumed to be absolute path patchdir="${2}" # ditto - ( - cd "${sdir}" || err "git_am_patches: !cd ${sdir}" for patch in "${patchdir}/"*; do [ -L "${patch}" ] && continue [ -f "${patch}" ] || continue - git am "${patch}" || patchfail="y" + git -C "${sdir}" am "${patch}" || patchfail="y" [ "${patchfail}" != "y" ] && continue - git am --abort || err "${sdir}: !git am --abort" + git -C "${sdir}" am --abort || err "${sdir}: !git am --abort" err "!git am ${patch} -> ${sdir}" done - ) || err "PATCH FAILURE" for patches in "${patchdir}/"*; do [ -L "${patches}" ] && continue [ ! -d "${patches}" ] && continue diff --git a/include/option.sh b/include/option.sh index 44952d09..c9845a03 100755 --- a/include/option.sh +++ b/include/option.sh @@ -58,9 +58,8 @@ EOF check_defconfig() { for x in "${1}"/config/*; do - [ -f "${x}" ] && return 0 + [ -f "${x}" ] && return 1 done - return 1 } handle_coreboot_utils() |