diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-13 18:34:58 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-13 18:34:58 -0400 |
commit | e51613a3291342c6006edda8783755fb8994fd75 (patch) | |
tree | f15408a266fd40c304e5c6d5f599d1a7161543b7 /tools/notsd-move | |
parent | 2762c4a1018fd85d3445e6438d88668a84f63067 (diff) | |
parent | d562632857beda5f7771b7087315ad67cb39e2dd (diff) |
Merge branch 'notsystemd/postmove' into notsystemd/master
Diffstat (limited to 'tools/notsd-move')
-rwxr-xr-x | tools/notsd-move | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/notsd-move b/tools/notsd-move index bf0646528f..0e8cc0dd87 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -683,13 +683,13 @@ breakup_makefile() ( [[ "$(wc -l <<<"$d")" = 1 ]] file="$d/Makefile" fi - elif [[ $file = all ]]; then - printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null - else - if ! in_array "$file" "${files[@]}"; then + if [[ "$file" != all ]] && ! in_array "$file" "${files[@]}"; then cat .tmp.move.all > "$file" files+=("$file") fi + elif [[ $file = all ]]; then + printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null + else printf '%s\n' "$line" >> "$file" fi done < <(fixup_makefile <Makefile.am) |