Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

checkpkg: Proper quoting, use double brackets 

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
Lukas Fleischer 2011-08-24 10:18:24 +02:00 committed by Pierre Schmitz
parent 88a929cfc0
commit ddb08cb9a1
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
checkpkg
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Source makepkg.conf; fail if it is not found # Source makepkg.conf; fail if it is not found
if [ -r '/etc/makepkg.conf' ]; then if [[ -r '/etc/makepkg.conf' ]]; then
source '/etc/makepkg.conf' source '/etc/makepkg.conf'
else else
echo '/etc/makepkg.conf not found!' echo '/etc/makepkg.conf not found!'
@ -9,86 +9,86 @@ else
fi fi
# Source user-specific makepkg.conf overrides # Source user-specific makepkg.conf overrides
if [ -r ~/.makepkg.conf ]; then if [[ -r ~/.makepkg.conf ]]; then
source ~/.makepkg.conf source ~/.makepkg.conf
fi fi
strip_url() { strip_url() {
echo $1 | sed 's|^.*://.*/||g' echo "$1" | sed 's|^.*://.*/||g'
} }
if [ ! -f PKGBUILD ]; then if [[ ! -f PKGBUILD ]]; then
echo 'This must be run in the directory of a built package.' echo 'This must be run in the directory of a built package.'
exit 1 exit 1
fi fi
. PKGBUILD . PKGBUILD
if [ "$arch" == 'any' ]; then if [[ $arch == 'any' ]]; then
CARCH='any' CARCH='any'
fi fi
STARTDIR=$(pwd) STARTDIR=$(pwd)
TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX) TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
cd $TEMPDIR cd "$TEMPDIR"
for _pkgname in ${pkgname[@]}; do for _pkgname in "${pkgname[@]}"; do
if [ -z ${epoch} ] ; then if [[ -z ${epoch} ]] ; then
pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
else else
pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT} pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
fi fi
if [ -f "$STARTDIR/$pkgfile" ]; then if [[ -f "$STARTDIR/$pkgfile" ]]; then
ln -s "$STARTDIR/$pkgfile" "$pkgfile" ln -s "$STARTDIR/$pkgfile" "$pkgfile"
elif [ -f "$PKGDEST/$pkgfile" ]; then elif [[ -f "$PKGDEST/$pkgfile" ]]; then
ln -s "$PKGDEST/$pkgfile" "$pkgfile" ln -s "$PKGDEST/$pkgfile" "$pkgfile"
else else
echo "File \"$pkgfile\" doesn't exist" echo "File \"$pkgfile\" doesn't exist"
exit 1 exit 1
fi fi
tmp=$(pacman -Spdd --noconfirm $_pkgname) tmp=$(pacman -Spdd --noconfirm "$_pkgname")
if [ $? -ne 0 ]; then if [[ $? -ne 0 ]]; then
echo "Couldn't download previous package for $_pkgname." echo "Couldn't download previous package for $_pkgname."
exit 1 exit 1
fi fi
pkgurl=$(echo $tmp | rev | cut -d ' ' -f 1 | rev) pkgurl=$(echo $tmp | rev | cut -d ' ' -f 1 | rev)
oldpkg=$(strip_url $pkgurl) oldpkg=$(strip_url "$pkgurl")
if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then if [[ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]]; then
echo "The built package ($_pkgname) is the one in the repo right now!" echo "The built package ($_pkgname) is the one in the repo right now!"
exit 1 exit 1
fi fi
if [ ! -f $oldpkg ]; then if [[ ! -f $oldpkg ]]; then
if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then
ln -s "${pkgurl#file://}" $(basename "${pkgurl#file://}") ln -s "${pkgurl#file://}" $(basename "${pkgurl#file://}")
elif [ -f "$PKGDEST/$oldpkg" ]; then elif [[ -f "$PKGDEST/$oldpkg" ]]; then
ln -s "$PKGDEST/$oldpkg" "$oldpkg" ln -s "$PKGDEST/$oldpkg" "$oldpkg"
elif [ -f "$STARTDIR/$oldpkg" ]; then elif [[ -f "$STARTDIR/$oldpkg" ]]; then
ln -s "$STARTDIR/$oldpkg" "$oldpkg" ln -s "$STARTDIR/$oldpkg" "$oldpkg"
else else
wget --quiet $pkgurl wget --quiet "$pkgurl"
fi fi
fi fi
bsdtar tf $oldpkg > filelist-$_pkgname-old bsdtar tf "$oldpkg" > "filelist-$_pkgname-old"
bsdtar tf "$pkgfile" > filelist-$_pkgname bsdtar tf "$pkgfile" > "filelist-$_pkgname"
sort -o filelist-$_pkgname filelist-$_pkgname sort -o "filelist-$_pkgname" "filelist-$_pkgname"
sort -o filelist-$_pkgname-old filelist-$_pkgname-old sort -o "filelist-$_pkgname-old" "filelist-$_pkgname-old"
sdiff -s filelist-$_pkgname-old filelist-$_pkgname sdiff -s "filelist-$_pkgname-old" "filelist-$_pkgname"
if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so' > /dev/null 2>&1; then if diff "filelist-$_pkgname-old" "filelist-$_pkgname" | grep '\.so' > /dev/null 2>&1; then
mkdir -p pkg mkdir -p pkg
cd pkg cd pkg
bsdtar xf ../"$pkgfile" > /dev/null bsdtar xf ../"$pkgfile" > /dev/null
for i in $(diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep '\.so' | awk '{print $2}'); do for i in $(diff "../filelist-$_pkgname-old" "../filelist-$_pkgname" | grep \> | grep '\.so' | awk '{print $2}'); do
echo "${i}: " "$(objdump -p $i | grep SONAME)" echo "${i}: " "$(objdump -p "$i" | grep SONAME)"
done done
cd .. cd ..
else else