[oe-commits] Darren Hart : send-pull-request: whitespace cleanup
git version control
git at git.openembedded.org
Thu May 19 22:41:19 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 187217ec380e89d81a53d9fd5f007d8f95356029
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=187217ec380e89d81a53d9fd5f007d8f95356029
Author: Darren Hart <dvhart at linux.intel.com>
Date: Fri May 13 10:36:03 2011 -0700
send-pull-request: whitespace cleanup
Indent with tabs, not spaces, for consistency with other bash scripts.
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Acked-by: Otavio Salvador <otavio at ossystems.com.br>
Cc: Otavio Salvador <otavio at ossystems.com.br>
---
scripts/send-pull-request | 250 ++++++++++++++++++++++----------------------
1 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 3af2a9f..76dd7a2 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -31,72 +31,72 @@ EOM
# $2: The regex to match and strip from the line with email addresses
harvest_recipients()
{
- TO_CC=$1
- REGX=$2
- export IFS=$',\n'
- for PATCH in $PDIR/*.patch; do
- # Grab To addresses
- for EMAIL in $(sed '/^---$/q' $PATCH | grep -e "$REGX" | sed "s/$REGX//"); do
- if [ "$TO_CC" == "TO" ] && [ "${TO/$EMAIL/}" == "$TO" ] && [ -n "$EMAIL" ]; then
- if [ -z "$TO" ]; then TO=$EMAIL; else TO="$TO,$EMAIL"; fi
- elif [ "$TO_CC" == "CC" ] && [ "${CC/$EMAIL/}" == "$CC" ] && [ -n "$EMAIL" ]; then
- if [ -z "$CC" ]; then CC=$EMAIL; else CC="$CC,$EMAIL"; fi
- fi
- done
- done
- unset IFS
+ TO_CC=$1
+ REGX=$2
+ export IFS=$',\n'
+ for PATCH in $PDIR/*.patch; do
+ # Grab To addresses
+ for EMAIL in $(sed '/^---$/q' $PATCH | grep -e "$REGX" | sed "s/$REGX//"); do
+ if [ "$TO_CC" == "TO" ] && [ "${TO/$EMAIL/}" == "$TO" ] && [ -n "$EMAIL" ]; then
+ if [ -z "$TO" ]; then TO=$EMAIL; else TO="$TO,$EMAIL"; fi
+ elif [ "$TO_CC" == "CC" ] && [ "${CC/$EMAIL/}" == "$CC" ] && [ -n "$EMAIL" ]; then
+ if [ -z "$CC" ]; then CC=$EMAIL; else CC="$CC,$EMAIL"; fi
+ fi
+ done
+ done
+ unset IFS
}
# Parse and verify arguments
while getopts "af:ghp:t:" OPT; do
- case $OPT in
- a)
- AUTO=1
- ;;
- f)
- FROM="$OPTARG"
- ;;
- g)
- PULL_MTA="git"
- ;;
- h)
- usage
- exit 0
- ;;
- p)
- PDIR=${OPTARG%/}
- if [ ! -d $PDIR ]; then
- echo "ERROR: pull-dir \"$PDIR\" does not exist."
- usage
- exit 1
- fi
- ;;
- t)
- if [ -n "$TO" ]; then
- TO="$TO,$OPTARG"
- else
- TO="$OPTARG"
- fi
- ;;
- esac
+ case $OPT in
+ a)
+ AUTO=1
+ ;;
+ f)
+ FROM="$OPTARG"
+ ;;
+ g)
+ PULL_MTA="git"
+ ;;
+ h)
+ usage
+ exit 0
+ ;;
+ p)
+ PDIR=${OPTARG%/}
+ if [ ! -d $PDIR ]; then
+ echo "ERROR: pull-dir \"$PDIR\" does not exist."
+ usage
+ exit 1
+ fi
+ ;;
+ t)
+ if [ -n "$TO" ]; then
+ TO="$TO,$OPTARG"
+ else
+ TO="$OPTARG"
+ fi
+ ;;
+ esac
done
if [ -z "$PDIR" ]; then
- echo "ERROR: you must specify a pull-dir."
- usage
- exit 1
+ echo "ERROR: you must specify a pull-dir."
+ usage
+ exit 1
fi
# Verify the cover letter is complete and free of tokens
CL="$PDIR/0000-cover-letter.patch"
for TOKEN in SUBJECT BLURB; do
- grep -q "*** $TOKEN HERE ***" "$CL"
- if [ $? -eq 0 ]; then
- echo "ERROR: Please edit $CL and try again (Look for '*** $TOKEN HERE ***')."
- exit 1
- fi
+ grep -q "*** $TOKEN HERE ***" "$CL"
+ if [ $? -eq 0 ]; then
+ echo "ERROR: Please edit $CL and try again (Look for '*** $TOKEN HERE ***')."
+ exit 1
+ fi
done
@@ -104,39 +104,39 @@ done
# In addition to To and CC headers/lines, the common Signed-off-by, Tested-by,
# etc. (*-by) will be added to CC.
if [ $AUTO -eq 1 ]; then
- harvest_recipients TO "^[Tt][Oo]: *"
- harvest_recipients CC "^[Cc][Cc]: *"
- harvest_recipients CC "^.*-[Bb][Yy]: *"
+ harvest_recipients TO "^[Tt][Oo]: *"
+ harvest_recipients CC "^[Cc][Cc]: *"
+ harvest_recipients CC "^.*-[Bb][Yy]: *"
fi
case "$PULL_MTA" in
- git)
- FROM="$(git config sendemail.from)"
+git)
+ FROM="$(git config sendemail.from)"
AUTO_TO="$(git config sendemail.to)"
if [ -n "$AUTO_TO" ]; then
- if [ -n "$TO" ]; then
- TO="$TO,$AUTO_TO"
- else
- TO="$AUTO_TO"
- fi
+ if [ -n "$TO" ]; then
+ TO="$TO,$AUTO_TO"
+ else
+ TO="$AUTO_TO"
+ fi
+ fi
+ ;;
+sendmail)
+ if [ -z "$FROM" ]; then
+ FROM="$(git config user.name) <$(git config user.email)>"
+ if [ -z "$FROM" ]; then
+ echo "ERROR: unable to determine a FROM address"
+ usage
+ exit 1
+ fi
fi
- ;;
- sendmail)
- if [ -z "$FROM" ]; then
- FROM="$(git config user.name) <$(git config user.email)>"
- if [ -z "$FROM" ]; then
- echo "ERROR: unable to determine a FROM address"
- usage
- exit 1
- fi
- fi
- ;;
+ ;;
esac
if [ -z "$TO" ] && [ -z "$CC" ]; then
- echo "ERROR: you have not specified any recipients."
- usage
- exit 1
+ echo "ERROR: you have not specified any recipients."
+ usage
+ exit 1
fi
@@ -155,55 +155,55 @@ echo "Continue? [y/N] "
read cont
if [ "$cont" == "y" ] || [ "$cont" == "Y" ]; then
- ERROR=0
- case "$PULL_MTA" in
- git)
- export IFS=$','
- GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
- GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
- unset IFS
- for PATCH in $PDIR/*patch; do
- # We harvest the emails manually, so force git not to.
- eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
- ;;
- sendmail)
- for PATCH in $PDIR/*patch; do
- # Insert To and CC headers via formail to keep them separate and
- # appending them to the sendmail command as -- $TO $CC has
- # proven to be an exercise in futility.
- #
- # Clear the From header, leaving it up to sendmail to insert an
- # appropriate one. Insert the original sender (per git) into the
- # body of the message.
- #
- # Use tail to remove the email envelope from git or formail as
- # msmtp (sendmail) would choke on them.
- #
- # Modify the patch date for sequential delivery, but retain the
- # original date as "Old-Date".
- DATE=$(date +"%a, %d %b %Y %k:%M:%S %z")
- GIT_FROM=$(cat $PATCH | formail -X "From:")
- cat $PATCH | formail -I "To: $TO" -I "CC: $CC" -I "From: $FROM" -i "Date: $DATE" | sed "0,/^$/s/^$/\n$GIT_FROM\n/" | tail -n +2 | sendmail -t
- if [ $? -eq 1 ]; then
- ERROR=1
- fi
- done
- ;;
- *)
- echo "ERROR: unknown MTA: $PULL_MTA"
- usage
- exit 1
- ;;
- esac
-
- if [ $ERROR -eq 1 ]; then
- echo "ERROR: Failed to send one or more messages. Check your MTA log for details."
- fi
+ ERROR=0
+ case "$PULL_MTA" in
+ git)
+ export IFS=$','
+ GIT_TO=$(for R in $TO; do echo -n "--to='$R' "; done)
+ GIT_CC=$(for R in $CC; do echo -n "--cc='$R' "; done)
+ unset IFS
+ for PATCH in $PDIR/*patch; do
+ # We harvest the emails manually, so force git not to.
+ eval "git send-email $GIT_TO $GIT_CC --no-chain-reply-to --suppress-cc=all $PATCH"
+ if [ $? -eq 1 ]; then
+ ERROR=1
+ fi
+ done
+ ;;
+ sendmail)
+ for PATCH in $PDIR/*patch; do
+ # Insert To and CC headers via formail to keep them separate and
+ # appending them to the sendmail command as -- $TO $CC has
+ # proven to be an exercise in futility.
+ #
+ # Clear the From header, leaving it up to sendmail to insert an
+ # appropriate one. Insert the original sender (per git) into the
+ # body of the message.
+ #
+ # Use tail to remove the email envelope from git or formail as
+ # msmtp (sendmail) would choke on them.
+ #
+ # Modify the patch date for sequential delivery, but retain the
+ # original date as "Old-Date".
+ DATE=$(date +"%a, %d %b %Y %k:%M:%S %z")
+ GIT_FROM=$(cat $PATCH | formail -X "From:")
+ cat $PATCH | formail -I "To: $TO" -I "CC: $CC" -I "From: $FROM" -i "Date: $DATE" | sed "0,/^$/s/^$/\n$GIT_FROM\n/" | tail -n +2 | sendmail -t
+ if [ $? -eq 1 ]; then
+ ERROR=1
+ fi
+ done
+ ;;
+ *)
+ echo "ERROR: unknown MTA: $PULL_MTA"
+ usage
+ exit 1
+ ;;
+ esac
+
+ if [ $ERROR -eq 1 ]; then
+ echo "ERROR: Failed to send one or more messages. Check your MTA log for details."
+ fi
else
- echo "Send aborted."
+ echo "Send aborted."
fi
More information about the Openembedded-commits
mailing list