From 1847f7b9ab7862b5dc1b2c0791cd52517cb7297f Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 21 Jul 2012 15:36:11 -0400 Subject: Fix pathname expansions. --- 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. -- cgit v0.9.1