aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorslakmagik <slakmagik@gmail.com>2011-01-28 22:57:51 -0500
committerRobby Workman <rworkman@slackbuilds.org>2011-03-01 08:54:49 -0600
commit3d3bf81d7322beeb1d9878d2a7f5bb859a567a16 (patch)
tree20dab1b84ae91c26467f1fb16590d11da44bf388
parentad832f6937e4db3a573dfa01fa6e909da9ad6e8d (diff)
desktop/Vanilla-DMZ: Miscellaneous cleanups
Move a code block that reduces package size to a better location which allows using the unmodified chmod boilerplate as a bonus. Remove a bashism of brace expansion which allows moving the separate mkdirs to a better location as a bonus. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--desktop/Vanilla-DMZ/Vanilla-DMZ.SlackBuild32
1 files changed, 16 insertions, 16 deletions
diff --git a/desktop/Vanilla-DMZ/Vanilla-DMZ.SlackBuild b/desktop/Vanilla-DMZ/Vanilla-DMZ.SlackBuild
index bc83a816c316..aa95d70086f6 100644
--- a/desktop/Vanilla-DMZ/Vanilla-DMZ.SlackBuild
+++ b/desktop/Vanilla-DMZ/Vanilla-DMZ.SlackBuild
@@ -24,28 +24,28 @@ cd $TMP
rm -rf $PRGNAM
tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
cd $PRGNAM
-# cut the size of the package in half
-( cd cursors
- md5sum * | sort -r | while read SUM FILE; do
- if [ "$OLD_SUM" = $SUM ]; then
- ln -sf $OLD_FILE $FILE
- else
- OLD_SUM=$SUM
- OLD_FILE=$FILE
- fi
- done )
chown -R root:root .
-# we need to test for links here because -perm 777 will find them and chmod
-# will chmod their targets 755 when they should be 644
-find . ! -type l \( \
+find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
- -o -perm 400 \) -exec chmod 644 {} \; \)
+ -o -perm 400 \) -exec chmod 644 {} \;
-mkdir -p $PKG/usr/{share/icons/$PRGNAM,doc/$PRGNAM-$VERSION}
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
mv COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# cut the size of the package in half
+( cd cursors
+ md5sum * | sort -r | while read SUM FILE; do
+ if [ "$OLD_SUM" = $SUM ]; then
+ ln -sf $OLD_FILE $FILE
+ else
+ OLD_SUM=$SUM
+ OLD_FILE=$FILE
+ fi
+ done )
+mkdir -p $PKG/usr/share/icons
mv $TMP/$PRGNAM $PKG/usr/share/icons/
mkdir -p $PKG/install