summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-24 05:48:05 (UTC)
committer kergoth <kergoth>2003-01-24 05:48:05 (UTC)
commit4495fda0ab1d48800c6101ec635bafb70ebd07f1 (patch) (side-by-side diff)
treed848b34e0bfe2c89bb664a92934128e6deca4e36
parent53b0504f955d22600f3123f0837b0a0541453fca (diff)
downloadopie-4495fda0ab1d48800c6101ec635bafb70ebd07f1.zip
opie-4495fda0ab1d48800c6101ec635bafb70ebd07f1.tar.gz
opie-4495fda0ab1d48800c6101ec635bafb70ebd07f1.tar.bz2
Correct a minor bug.. now it uses -e instead of -x to check for the pre/post scripts, and chmod 755's them after cp'ing, in case the permissions are hosed.
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkipks b/mkipks
index 4685f5f..ffa4ef5 100755
--- a/mkipks
+++ b/mkipks
@@ -195,46 +195,47 @@ do
size=$(mkfs.jffs2 -r $DATADIR | wc -c)
fi
echo "Package: $packagename" >$CTRLDIR/control
if [ ! -z "$size" ]; then
echo "Installed-Size: $size" >>$CTRLDIR/control
else
if [ -z "$SIZEWARNED" ]
then
echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size."
SIZEWARNED=1
fi
fi
echo "Architecture: $ARCH" >>$CTRLDIR/control
echo "Filename: ./$package.ipk" >>$CTRLDIR/control
echo "Version: $version" >>$CTRLDIR/control
[ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control
[ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control
[ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control
egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i
[ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary
base=${i%.control}
scripts="preinst postinst prerm postrm"
for pf in $scripts
do
- if [ -x ${base}.$pf ]
+ if [ -e ${base}.$pf ]
then
cp ${base}.$pf $CTRLDIR/$pf
+ chmod 755 $CTRLDIR/$pf
fi
done
cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR;
RESULT=$package.ipk
if [ -n "$VERB" ]
then
echo >&2 "Built $RESULT ($size)"
fi
if [ -n "$LIST" ]
then
echo $RESULT
fi
fi
else
echo >&2 "Not building $package package"
fi
done
# clean up
rm -rf $TDIR