~gotmax23/fedora-scripts

3065d178dda538239c3c6d6dccd43d7a90facc23 — Maxwell G 2 years ago b033014
build2.sh: Fix quoting error

git merge "" does not work. We want the value to be ommited if gpgsign
isn't defined.
1 files changed, 2 insertions(+), 2 deletions(-)

M rebuilds/build2.sh
M rebuilds/build2.sh => rebuilds/build2.sh +2 -2
@@ 42,7 42,7 @@ bump_and_commit() {
    rpmdev-bumpspec -c "${message}" "${package}.spec" | tee -a "${logfmt}"
    # --allow-empty is neded for rpmautospec
    git add "${package}.spec"
    git commit "${gpgsign:-}" --allow-empty -m "${message}" | tee -a "${logfmt}"
    git commit ${gpgsign:-} --allow-empty -m "${message}" | tee -a "${logfmt}"
}

branch="${branch:-f35}"


@@ 93,7 93,7 @@ git reset --hard "origin/${branch}"
mkdir -p "${logdir}"

if [ "${action}" == "merge" ] || [ "${action}" == "rawhide_commit" ]; then
    git merge "${gpgsign:-}" origin/rawhide | tee -a "${logfmt}"
    git merge ${gpgsign:-} origin/rawhide | tee -a "${logfmt}"
elif [ "${action}" == "commit" ]; then
    bump_and_commit
fi