summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-12-29 18:24:57 +0100
committerDan McGee <dan@archlinux.org>2007-12-29 18:58:23 +0100
commitfbd88a8212e794899e75ecf44024777c5a58deb2 (patch)
tree4748aecb586075912c8cd3012d105118c8ed6a21 /contrib
parent01930400a5f40f4ea5e9cafeff00afff515d0a2c (diff)
downloadpacman-fbd88a8212e794899e75ecf44024777c5a58deb2.tar.gz
pacman-fbd88a8212e794899e75ecf44024777c5a58deb2.tar.xz
Remove .FILELIST generation from makepkg (and elsewhere)
This is something pacman can do on its own straight from the archive, and we will reduce the chance of problems occurring becuase of inproper FILELIST generation as we have had in the past with special characters in filenames. Once we remove it from makepkg. we can remove any usage of it from all of our other tools, including pacman, pactest, and contrib/ utilities. Note that removing it from pacman uncovered a few other bugs anyway, so this was probably a good move. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/re-pacman8
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/re-pacman b/contrib/re-pacman
index 0d0328b1..fff1c873 100755
--- a/contrib/re-pacman
+++ b/contrib/re-pacman
@@ -60,20 +60,18 @@ if [ "x${ver}" = "x" ]; then
fi
echo ":: Cleaning up old files"
-rm -f .PKGINFO .FILELIST "${1}-${ver}.pkg.tar.gz"
+rm -f .PKGINFO "${1}-${ver}.pkg.tar.gz"
echo ":: Building PKGINFO"
make_pkginfo ${1} > .PKGINFO
-echo ":: Building FILELIST"
-pacman -Ql ${1} | cut -d' ' -f2- > .FILELIST
-flist=".PKGINFO .FILELIST"
+flist=".PKGINFO"
flist="${flist} $(pacman -Ql ${1} | sed 's|\w* \(.*\)|/\1|g' | grep -v '/$')"
echo ":: Building final package tarball"
echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null
-rm -f .PKGINFO .FILELIST
+rm -f .PKGINFO
echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation"
# vim: set ts=2 sw=2 noet: