[23067] in Source-Commits
/svn/athena r22730 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Fri Feb 1 13:16:55 2008
Date: Fri, 1 Feb 2008 13:15:01 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200802011815.NAA17790@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-02-01 13:15:00 -0500 (Fri, 01 Feb 2008)
New Revision: 22730
Modified:
trunk/debathena/scripts/daupload-release
Log:
* debathena/scripts/daupload-release: Factor out the base of
the source changes file into a variable so that we don't
have to keep calculating it.
Modified: trunk/debathena/scripts/daupload-release
===================================================================
--- trunk/debathena/scripts/daupload-release 2008-01-31 18:43:08 UTC (rev 22729)
+++ trunk/debathena/scripts/daupload-release 2008-02-01 18:15:00 UTC (rev 22730)
@@ -41,6 +41,7 @@
change=$1
cd "$(dirname "$change")"
change=$(basename "$change")
+base=${change%_source.changes}
check () {
[ -s "$1" ] || missing="$missing$1 "
@@ -52,27 +53,27 @@
missing=
[ -s "$change" ]
if [ $S -ne 1 ]; then
- check "${change%_source.changes}~debian3.1_i386.changes"
- check "${change%_source.changes}~debian4.0_amd64.changes"
- check "${change%_source.changes}~debian4.1~0.1_amd64.changes"
- check "${change%_source.changes}~ubuntu6.06_amd64.changes"
- check "${change%_source.changes}~ubuntu6.10_amd64.changes"
- check "${change%_source.changes}~ubuntu7.04_amd64.changes"
- check "${change%_source.changes}~ubuntu7.10_amd64.changes"
+ check "$base~debian3.1_i386.changes"
+ check "$base~debian4.0_amd64.changes"
+ check "$base~debian4.1~0.1_amd64.changes"
+ check "$base~ubuntu6.06_amd64.changes"
+ check "$base~ubuntu6.10_amd64.changes"
+ check "$base~ubuntu7.04_amd64.changes"
+ check "$base~ubuntu7.10_amd64.changes"
if [ $A -eq 1 ]; then
- uncheck "${change%_source.changes}~debian4.0_i386.changes"
- uncheck "${change%_source.changes}~debian4.1~0.1_i386.changes"
- uncheck "${change%_source.changes}~ubuntu6.06_i386.changes"
- uncheck "${change%_source.changes}~ubuntu6.10_i386.changes"
- uncheck "${change%_source.changes}~ubuntu7.04_i386.changes"
- uncheck "${change%_source.changes}~ubuntu7.10_i386.changes"
+ uncheck "$base~debian4.0_i386.changes"
+ uncheck "$base~debian4.1~0.1_i386.changes"
+ uncheck "$base~ubuntu6.06_i386.changes"
+ uncheck "$base~ubuntu6.10_i386.changes"
+ uncheck "$base~ubuntu7.04_i386.changes"
+ uncheck "$base~ubuntu7.10_i386.changes"
else
- check "${change%_source.changes}~debian4.0_i386.changes"
- check "${change%_source.changes}~debian4.1~0.1_i386.changes"
- check "${change%_source.changes}~ubuntu6.06_i386.changes"
- check "${change%_source.changes}~ubuntu6.10_i386.changes"
- check "${change%_source.changes}~ubuntu7.04_i386.changes"
- check "${change%_source.changes}~ubuntu7.10_i386.changes"
+ check "$base~debian4.0_i386.changes"
+ check "$base~debian4.1~0.1_i386.changes"
+ check "$base~ubuntu6.06_i386.changes"
+ check "$base~ubuntu6.10_i386.changes"
+ check "$base~ubuntu7.04_i386.changes"
+ check "$base~ubuntu7.10_i386.changes"
fi
fi
@@ -95,36 +96,36 @@
$REPREPROI include gutsy "$change"
if [ $S -ne 1 ]; then
- $REPREPRO include sarge "${change%_source.changes}~debian3.1_i386.changes"
- [ $A -eq 1 ] || $REPREPRO include etch "${change%_source.changes}~debian4.0_i386.changes"
- $REPREPRO include etch "${change%_source.changes}~debian4.0_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include lenny "${change%_source.changes}~debian4.1~0.1_i386.changes"
- $REPREPRO include lenny "${change%_source.changes}~debian4.1~0.1_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include dapper "${change%_source.changes}~ubuntu6.06_i386.changes"
- $REPREPRO include dapper "${change%_source.changes}~ubuntu6.06_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include edgy "${change%_source.changes}~ubuntu6.10_i386.changes"
- $REPREPRO include edgy "${change%_source.changes}~ubuntu6.10_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include feisty "${change%_source.changes}~ubuntu7.04_i386.changes"
- $REPREPRO include feisty "${change%_source.changes}~ubuntu7.04_amd64.changes"
- [ $A -eq 1 ] || $REPREPRO include gutsy "${change%_source.changes}~ubuntu7.10_i386.changes"
- $REPREPRO include gutsy "${change%_source.changes}~ubuntu7.10_amd64.changes"
+ $REPREPRO include sarge "$base~debian3.1_i386.changes"
+ [ $A -eq 1 ] || $REPREPRO include etch "$base~debian4.0_i386.changes"
+ $REPREPRO include etch "$base~debian4.0_amd64.changes"
+ [ $A -eq 1 ] || $REPREPRO include lenny "$base~debian4.1~0.1_i386.changes"
+ $REPREPRO include lenny "$base~debian4.1~0.1_amd64.changes"
+ [ $A -eq 1 ] || $REPREPRO include dapper "$base~ubuntu6.06_i386.changes"
+ $REPREPRO include dapper "$base~ubuntu6.06_amd64.changes"
+ [ $A -eq 1 ] || $REPREPRO include edgy "$base~ubuntu6.10_i386.changes"
+ $REPREPRO include edgy "$base~ubuntu6.10_amd64.changes"
+ [ $A -eq 1 ] || $REPREPRO include feisty "$base~ubuntu7.04_i386.changes"
+ $REPREPRO include feisty "$base~ubuntu7.04_amd64.changes"
+ [ $A -eq 1 ] || $REPREPRO include gutsy "$base~ubuntu7.10_i386.changes"
+ $REPREPRO include gutsy "$base~ubuntu7.10_amd64.changes"
fi
changes=$change
-changes=$changes\ ${change%_source.changes}~debian3.1_i386.changes
-[ $A -eq 1 ] || changes=$changes\ ${change%_source.changes}~debian4.0_i386.changes
-changes=$changes\ ${change%_source.changes}~debian4.0_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ ${change%_source.changes}~debian4.1~0.1_i386.changes
-changes=$changes\ ${change%_source.changes}~debian4.1~0.1_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ ${change%_source.changes}~ubuntu6.06_i386.changes
-changes=$changes\ ${change%_source.changes}~ubuntu6.06_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ ${change%_source.changes}~ubuntu6.10_i386.changes
-changes=$changes\ ${change%_source.changes}~ubuntu6.10_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ ${change%_source.changes}~ubuntu7.04_i386.changes
-changes=$changes\ ${change%_source.changes}~ubuntu7.04_amd64.changes
-[ $A -eq 1 ] || changes=$changes\ ${change%_source.changes}~ubuntu7.10_i386.changes
-changes=$changes\ ${change%_source.changes}~ubuntu7.10_amd64.changes
+changes=$changes\ $base~debian3.1_i386.changes
+[ $A -eq 1 ] || changes=$changes\ $base~debian4.0_i386.changes
+changes=$changes\ $base~debian4.0_amd64.changes
+[ $A -eq 1 ] || changes=$changes\ $base~debian4.1~0.1_i386.changes
+changes=$changes\ $base~debian4.1~0.1_amd64.changes
+[ $A -eq 1 ] || changes=$changes\ $base~ubuntu6.06_i386.changes
+changes=$changes\ $base~ubuntu6.06_amd64.changes
+[ $A -eq 1 ] || changes=$changes\ $base~ubuntu6.10_i386.changes
+changes=$changes\ $base~ubuntu6.10_amd64.changes
+[ $A -eq 1 ] || changes=$changes\ $base~ubuntu7.04_i386.changes
+changes=$changes\ $base~ubuntu7.04_amd64.changes
+[ $A -eq 1 ] || changes=$changes\ $base~ubuntu7.10_i386.changes
+changes=$changes\ $base~ubuntu7.10_amd64.changes
files=${change%.changes}.build\ $changes
origfiles=
