diff options
author | Leah Rowe <info@minifree.org> | 2017-09-22 00:01:52 +0000 |
---|---|---|
committer | Gogs <gogitservice@gmail.com> | 2017-09-22 00:01:52 +0000 |
commit | 96b3a3f8c9dd059318f49e2ce147d966487600f4 (patch) | |
tree | 2295a42b15a595693827acb983a7bd6886dc1528 /libs/git | |
parent | 458f8d3621c95d02cd0335a3fff11bb94a34c14f (diff) | |
parent | b6b87eae55b7743ccfa3d6523794767c8d9186a0 (diff) | |
download | librebootfr-96b3a3f8c9dd059318f49e2ce147d966487600f4.tar.gz librebootfr-96b3a3f8c9dd059318f49e2ce147d966487600f4.zip |
Merge branch 'braces-braces-braces' of kragle/libreboot into master
Diffstat (limited to 'libs/git')
-rwxr-xr-x | libs/git | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -205,7 +205,7 @@ git_files() { local repository_path="$1" ( - cd "${repository_path}" + cd "$repository_path" # Reproducible sorting. git ls-files -z | env LC_ALL='C.UTF-8' sort -z ) @@ -231,23 +231,23 @@ git_project_patch_recursive() { local branch="$3" local path="${4:-.}" - local repository_path="$(git_project_repository_path "${repository}")" - local project_path="$(project_path "${project}")" - local patches_path="${project_path}/${PATCHES}/${path}" + local repository_path="$(git_project_repository_path "$repository")" + local project_path="$(project_path "$project")" + local patches_path="$project_path/$PATCHES/$path" - if ! [[ -d "${patches_path}" ]]; then + if ! [[ -d "$patches_path" ]]; then return fi - if [[ "${path}" != "." ]]; then - git_project_patch_recursive "${project}" "${repository}" "${branch}" "$(dirname "${path}")" + if [[ "$path" != "." ]]; then + git_project_patch_recursive "$project" "$repository" "$branch" "$(dirname "$path")" fi - for patch in "${patches_path}"/[!.]*.@(patch|diff); do + for patch in "$patches_path"/[!.]*.@(patch|diff); do if [[ "${patch##*.}" == "patch" ]]; then - git_patch "${repository_path}" "${branch}" "${patch}" + git_patch "$repository_path" "$branch" "$patch" else - diff_patch_file "${repository_path}" "${patch}" + diff_patch_file "$repository_path" "$patch" fi done } |