commit 31e833b741fc329da0324dde5b7a32789dad4114 Author: Till Maas opensource@till.name Date: Tue Sep 30 17:12:50 2014 +0200
buildbranched/rawhide: Remove tabs
scripts/buildbranched | 34 +++++++++++++++++----------------- scripts/buildrawhide | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) --- diff --git a/scripts/buildbranched b/scripts/buildbranched index 1ae9865..623379b 100755 --- a/scripts/buildbranched +++ b/scripts/buildbranched @@ -1,7 +1,7 @@ #!/bin/bash
# Copyright (C) 2012 Red Hat Inc. -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0+
# runs currently on releng03.phx2.fedoraproject.org
@@ -43,8 +43,8 @@ DESTPATH="$TREEPREFIX/development/$BRANCHED/" # basepath of $0 scriptname="${0##*/}" [ -z "$DATE" ] && { - echo "usage: ${scriptname} <date>" - exit 1 + echo "usage: ${scriptname} <date>" + exit 1 }
TMPDIR=`mktemp -d /tmp/${DIST}.$DATE.XXXX` @@ -60,20 +60,20 @@ logfile="${logdir}/build${DIST}.log" touch "${logfile}" function log() { - message="${1}" - echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}" + message="${1}" + echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}" }
function send_fedmsg() { - log="${1}" - topic="${2}" - # Emit a message using bodhi's cert (since we should be running as "masher"). - echo "{"log": "${log}", "branch": "$BRANCHED", "arch": "$ARCH"}" | fedmsg-logger \ - --cert-prefix bodhi \ - --modname compose \ - --topic "${DIST}.${topic}" \ - --json-input + log="${1}" + topic="${2}" + # Emit a message using bodhi's cert (since we should be running as "masher"). + echo "{"log": "${log}", "branch": "$BRANCHED", "arch": "$ARCH"}" | fedmsg-logger \ + --cert-prefix bodhi \ + --modname compose \ + --topic "${DIST}.${topic}" \ + --json-input }
log "started" @@ -85,10 +85,10 @@ log "blocking retired packages" log "git clone of comps started" pushd $TMPDIR git clone git://git.fedorahosted.org/comps.git && { - pushd comps - make comps-f$BRANCHED.xml - cp comps-f$BRANCHED.xml $logdir/ - popd + pushd comps + make comps-f$BRANCHED.xml + cp comps-f$BRANCHED.xml $logdir/ + popd } popd log "git clone of comps finished" diff --git a/scripts/buildrawhide b/scripts/buildrawhide index 6893250..5b02815 100755 --- a/scripts/buildrawhide +++ b/scripts/buildrawhide @@ -1,7 +1,7 @@ #!/bin/bash
# Copyright (C) 2013 Red Hat Inc. -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0+
# runs currently on releng03.phx2.fedoraproject.org
@@ -43,8 +43,8 @@ DESTPATH="$TREEPREFIX/development/$BRANCHED/" # basepath of $0 scriptname="${0##*/}" [ -z "$DATE" ] && { - echo "usage: ${scriptname} <date>" - exit 1 + echo "usage: ${scriptname} <date>" + exit 1 }
TMPDIR=`mktemp -d /tmp/${DIST}.$DATE.XXXX` @@ -60,20 +60,20 @@ logfile="${logdir}/build${DIST}.log" touch "${logfile}" function log() { - message="${1}" - echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}" + message="${1}" + echo "$(date --utc) build${DIST}: ${message}" >> "${logfile}" }
function send_fedmsg() { - log="${1}" - topic="${2}" - # Emit a message using bodhi's cert (since we should be running as "masher"). - echo "{"log": "${log}", "branch": "$BRANCHED", "arch": "$ARCH"}" | fedmsg-logger \ - --cert-prefix bodhi \ - --modname compose \ - --topic "${DIST}.${topic}" \ - --json-input + log="${1}" + topic="${2}" + # Emit a message using bodhi's cert (since we should be running as "masher"). + echo "{"log": "${log}", "branch": "$BRANCHED", "arch": "$ARCH"}" | fedmsg-logger \ + --cert-prefix bodhi \ + --modname compose \ + --topic "${DIST}.${topic}" \ + --json-input }
log "started" @@ -85,10 +85,10 @@ log "blocking retired packages" log "git clone of comps started" pushd $TMPDIR git clone git://git.fedorahosted.org/comps.git && { - pushd comps - make comps-rawhide - cp comps-rawhide.xml $logdir/ - popd + pushd comps + make comps-rawhide + cp comps-rawhide.xml $logdir/ + popd } popd log "git clone of comps finished"
rel-eng@lists.fedoraproject.org