summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-24 05:48:05 (UTC)
committer kergoth <kergoth>2003-01-24 05:48:05 (UTC)
commit4495fda0ab1d48800c6101ec635bafb70ebd07f1 (patch) (unidiff)
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
@@ -207,27 +207,28 @@ do
207 echo "Architecture: $ARCH" >>$CTRLDIR/control 207 echo "Architecture: $ARCH" >>$CTRLDIR/control
208 echo "Filename: ./$package.ipk" >>$CTRLDIR/control 208 echo "Filename: ./$package.ipk" >>$CTRLDIR/control
209 echo "Version: $version" >>$CTRLDIR/control 209 echo "Version: $version" >>$CTRLDIR/control
210 [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control 210 [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control
211 [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control 211 [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control
212 [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control 212 [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control
213 egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i 213 egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i
214 [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary 214 [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary
215 base=${i%.control} 215 base=${i%.control}
216 scripts="preinst postinst prerm postrm" 216 scripts="preinst postinst prerm postrm"
217 for pf in $scripts 217 for pf in $scripts
218 do 218 do
219 if [ -x ${base}.$pf ] 219 if [ -e ${base}.$pf ]
220 then 220 then
221 cp ${base}.$pf $CTRLDIR/$pf 221 cp ${base}.$pf $CTRLDIR/$pf
222 chmod 755 $CTRLDIR/$pf
222 fi 223 fi
223 done 224 done
224 cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; 225 cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR;
225 RESULT=$package.ipk 226 RESULT=$package.ipk
226 if [ -n "$VERB" ] 227 if [ -n "$VERB" ]
227 then 228 then
228 echo >&2 "Built $RESULT ($size)" 229 echo >&2 "Built $RESULT ($size)"
229 fi 230 fi
230 if [ -n "$LIST" ] 231 if [ -n "$LIST" ]
231 then 232 then
232 echo $RESULT 233 echo $RESULT
233 fi 234 fi