bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Jrgen Htzel <juergen@hoetzel.info>

Browse source 
* fix in_array variables and usage
* correct the final compression - 'filelist' was unused
This commit is contained in:
Aaron Griffin 2006-12-21 20:50:24 +00:00
parent f104023999
commit 3e3f30a212
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/makepkg
View file

@ -120,7 +120,7 @@ check_option() {
} }
in_array() { in_array() {
needle=$1 local needle=$1
shift 1 shift 1
[ -z "$1" ] && return 1 [ -z "$1" ] && return 1
for i in $*; do for i in $*; do
@ -441,7 +441,7 @@ if [ $(echo $pkgrel | grep '-') ]; then
error "pkgrel is not allowed to contain hyphens." error "pkgrel is not allowed to contain hyphens."
exit 1 exit 1
fi fi
if [ ! in_array $CARCH ${arch[@]} ]; then if ! in_array $CARCH ${arch[@]}; then
error "$pkgname is not available for the '$CARCH' architecture." error "$pkgname is not available for the '$CARCH' architecture."
plain "Note that many packages may need a line added to their $BUILDSCRIPT" plain "Note that many packages may need a line added to their $BUILDSCRIPT"
plain "such as arch=('$CARCH')." plain "such as arch=('$CARCH')."
@ -884,22 +884,19 @@ tar cvf /dev/null * | sort >.FILELIST
# tar it up # tar it up
msg "Compressing package..." msg "Compressing package..."
cd $startdir/pkg cd $startdir/pkg
if [ -f $startdir/pkg/.INSTALL ]; then
cmd="tar czvf $PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT} .PKGINFO .FILELIST .INSTALL *"
else
cmd="tar czvf $PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT} .PKGINFO .FILELIST *"
fi
$cmd | sort >../filelist
if [ ${PIPESTATUS[0]} -gt 0 ]; then pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}"
comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}"
if ! tar czf $pkg_file $comp_files *; then
error "Failed to create package file." error "Failed to create package file."
exit ${PIPESTATUS[0]} exit 1
fi fi
cd $startdir cd $startdir
if [ "$CLEANUP" = "1" ]; then if [ "$CLEANUP" = "1" ]; then
msg "Cleaning up..." msg "Cleaning up..."
rm -rf src pkg filelist rm -rf src pkg
rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log* rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*
fi fi