summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-07-21 15:36:11 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-07-21 16:01:02 (EDT)
commit1847f7b9ab7862b5dc1b2c0791cd52517cb7297f (patch)
tree093f8e71b3a0c6a8dd8a68f436a146a55a702fcd
parent6288e1e6e146da14354e07e2b85eba58658672d2 (diff)
downloaddeb-1847f7b9ab7862b5dc1b2c0791cd52517cb7297f.zip
deb-1847f7b9ab7862b5dc1b2c0791cd52517cb7297f.tar.gz
deb-1847f7b9ab7862b5dc1b2c0791cd52517cb7297f.tar.bz2
Fix pathname expansions.
-rwxr-xr-xsrc/deb.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/deb.sh b/src/deb.sh
index bf8fb1a..c6e15ca 100755
--- a/src/deb.sh
+++ b/src/deb.sh
@@ -330,17 +330,16 @@ EOF
dsc="$(get_dsc_name "${pkg}")"
# Ensure that source package is unpacked.
- [ ! -d "${DEB_TREE}/work/${pkg}/${pkg}-*" ] && \
+ [ ! -d "${DEB_TREE}/work/${pkg}/${pkg}-"* ] && \
error 'Source package "%s" not unpacked for editing' "${pkg}"
+ cd "${DEB_TREE}/work/${pkg}/${pkg}-"*
# Get source package version from internal list.
oldverrev="${dsc%.dsc}"
oldverrev="${oldverrev#${pkg}_}"
# Get source package version from work area.
- verrev="$(dpkg-parsechangelog \
- -l"${DEB_TREE}/work/${pkg}/${pkg}-*/debian/changelog" | \
- sed -n 's/^Version: \(.*\)$/\1/p')"
+ verrev="$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)$/\1/p')"
pkgverrev="${pkg}_${verrev}"
ver="${verrev%-*}"
rev="${verrev#*-}"
@@ -350,7 +349,6 @@ EOF
error 'Version not incremented'
# Build source package.
- cd "${DEB_TREE}/work/${pkg}/${pkg}-*"
dpkg-buildpackage -S -us -uc
# Make a clean source package destination.