diff options
| author | slakmagik <slakmagik@gmail.com> | 2011-01-28 23:47:24 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-03-01 09:54:14 -0600 |
| commit | 8467c8e1120b881d9d34bfcdd4ffe92d9d4b7e41 (patch) | |
| tree | de2e38cb1ddaf45a8b9385ea6effbca3dc736efc /system/rox-filer/rox-filer.SlackBuild | |
| parent | cd4cf90c0a77ae563adbb7b44c16d09790600931 (diff) | |
system/rox-filer: Miscellaneous cleanups
Clarify a point in the README that some users are interested in. Update
the doinst.sh to the new template. Remove unneeded comments. Comment why
there's no strip code. Fix indentation. Remove bashism (brace
expansion). Replace a 'cd...cd -' with a subshell. Tighten up other
one-line subshells so it's consistent with the rest of the one-line
subshells.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/rox-filer/rox-filer.SlackBuild')
| -rw-r--r-- | system/rox-filer/rox-filer.SlackBuild | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/system/rox-filer/rox-filer.SlackBuild b/system/rox-filer/rox-filer.SlackBuild index 754029123a37b..3b624d04977ff 100644 --- a/system/rox-filer/rox-filer.SlackBuild +++ b/system/rox-filer/rox-filer.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-2.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -53,6 +51,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +# this autostrips the non-debug binary CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./ROX-Filer/AppRun --compile # begin poor man's 'make install' (*heavily* adapted from rox's interactive @@ -66,18 +65,18 @@ MANDIR=/usr/man/man1 MIMEDIR=/usr/share/mime mkdir -p \ - $PKG/$APPDIR \ - $PKG/$BINDIR \ - $PKG/$CHOICESDIR \ - $PKG/$DOCDIR \ - $PKG/$MANDIR \ - $PKG/$MIMEDIR/packages + $PKG/$APPDIR \ + $PKG/$BINDIR \ + $PKG/$CHOICESDIR \ + $PKG/$DOCDIR \ + $PKG/$MANDIR \ + $PKG/$MIMEDIR/packages (cd ROX-Filer/src && make clean) > /dev/null 2>&1 cp -a ROX-Filer $PKG/$APPDIR # the actual original files of symlink.png and mime-application:x-jar.png, # which also have symlinks to them, are executable and shouldn't be. -chmod 644 $PKG/$APPDIR/ROX-Filer/{images,ROX/MIME}/* +chmod 0644 $PKG/$APPDIR/ROX-Filer/images/* $PKG/$APPDIR/ROX-Filer/ROX/MIME/* # the APP_DIR isn't on the path, so this lets the user run the filer with a # simple 'rox' invocation. @@ -88,21 +87,20 @@ EOF chmod 0755 $PKG/$BINDIR/rox # Don't clobber these on upgrades -cd Choices/MIME-types +( cd Choices/MIME-types for file in * ; do mv $file $PKG/$CHOICESDIR/$file.new ; - done -cd - + done ) # The doc files are accessible through the UI, so need to be left here, but # there also need to be docs in the usual /usr/doc dir, so we link. The # build script ends up in ROX's help dir, too, but that's actually kinda cool. # ;) -( cd $PKG/$DOCDIR && ln -sf $APPDIR/ROX-Filer/Help $PRGNAM-$VERSION ) +(cd $PKG/$DOCDIR && ln -sf $APPDIR/ROX-Filer/Help $PRGNAM-$VERSION) cat $CWD/$PRGNAM.SlackBuild > $PKG/$APPDIR/ROX-Filer/Help/$PRGNAM.SlackBuild gzip -9c rox.1 > $PKG/$MANDIR/rox.1.gz -( cd $PKG/$MANDIR ; ln -sf rox.1.gz ROX-Filer.1.gz ) +(cd $PKG/$MANDIR; ln -sf rox.1.gz ROX-Filer.1.gz) cp rox.xml $PKG/$MIMEDIR/packages/rox.xml |