This mostly results in the addition of quotes to prevent globbing. Signed-off-by: Stephen Finucane <step...@that.guru> --- tools/patchwork-update-commits | 8 ++++---- tools/post-receive.hook | 22 +++++++++++----------- tools/vagrant/install.sh | 2 -- 3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/tools/patchwork-update-commits b/tools/patchwork-update-commits index 61952c0..257819e 100755 --- a/tools/patchwork-update-commits +++ b/tools/patchwork-update-commits @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA toolsdir="$(dirname "$0")" -pwpath="${toolsdir}"/../patchwork +pwpath="${toolsdir}/../patchwork" if [ "$#" -lt 1 ]; then echo "usage: $0 <revspec>" >&2 @@ -28,7 +28,7 @@ if [ "$#" -lt 1 ]; then fi git rev-list --reverse "$@" | -while read commit; do - hash=$(git diff "$commit~..$commit" | python $pwpath/hasher.py) - $pwpath/bin/pwclient update -s Accepted -c "$commit" -h "$hash" +while read -r commit; do + hash=$(git diff "$commit~..$commit" | python "$pwpath/hasher.py") + "$pwpath/bin/pwclient" update -s Accepted -c "$commit" -h "$hash" done diff --git a/tools/post-receive.hook b/tools/post-receive.hook index 42de90a..c29b221 100755 --- a/tools/post-receive.hook +++ b/tools/post-receive.hook @@ -38,58 +38,58 @@ trap "do_exit=1" INT get_patchwork_hash() { local hash hash=$(git diff "$1~..$1" | python $PWDIR/hasher.py) - echo $hash + echo "$hash" test -n "$hash" } get_patch_id() { local id - id=$($PWDIR/bin/pwclient info -h $1 2>/dev/null \ + id=$($PWDIR/bin/pwclient info -h "$1" 2>/dev/null \ | sed -rne 's,- id[[:space:]]*: ,,p') - echo $id + echo "$id" test -n "$id" } set_patch_state() { - $PWDIR/bin/pwclient update -s $2 -c $3 $1 2>&1 + $PWDIR/bin/pwclient update -s "$2" -c "$3" "$1" 2>&1 } update_patches() { local cnt; cnt=0 for rev in $(git rev-parse --not ${EXCLUDE} | - git rev-list --stdin --no-merges --reverse ${1}..${2}); do + git rev-list --stdin --no-merges --reverse "${1}".."${2}"); do if [ "$do_exit" = 1 ]; then echo "I: exiting..." >&2 break fi - hash=$(get_patchwork_hash $rev) + hash=$(get_patchwork_hash "$rev") if [ -z "$hash" ]; then echo "E: failed to hash rev $rev." >&2 continue fi - id=$(get_patch_id $hash) + id=$(get_patch_id "$hash") if [ -z "$id" ]; then echo "E: failed to find patch for rev $rev." >&2 continue fi - reason="$(set_patch_state $id $3 $rev)" + reason="$(set_patch_state "$id" "$3" "$rev")" if [ -n "$reason" ]; then echo "E: failed to update patch #$id${reason:+: $reason}." >&2 continue fi echo "I: patch #$id updated using rev $rev." >&2 - cnt=$(($cnt + 1)) + cnt=$((cnt + 1)) done echo "I: $cnt patch(es) updated to state $3." >&2 } -while read oldrev newrev refname; do +while read -r oldrev newrev refname; do found=0 for i in $STATE_MAP; do key="${i%:*}" if [ "$key" = "$refname" ]; then - update_patches $oldrev $newrev ${i#*:} + update_patches "$oldrev" "$newrev" ${i#*:} found=1 break fi diff --git a/tools/vagrant/install.sh b/tools/vagrant/install.sh index eb25910..a930ddc 100644 --- a/tools/vagrant/install.sh +++ b/tools/vagrant/install.sh @@ -4,9 +4,7 @@ echo -e "\n--- Configuring environment ---\n" -PROJECT_NAME=patchwork PROJECT_HOME=/vagrant -WORKON_HOME=$PROJECT_HOME/.virtualenvs db_user=root db_pass=password -- 2.9.3 _______________________________________________ Patchwork mailing list Patchwork@lists.ozlabs.org https://lists.ozlabs.org/listinfo/patchwork