summaryrefslogtreecommitdiff
path: root/system/rox-filer
diff options
context:
space:
mode:
authorslakmagik <slakmagik@gmail.com>2011-01-28 23:47:24 -0500
committerRobby Workman <rworkman@slackbuilds.org>2011-03-01 09:54:14 -0600
commit8467c8e1120b881d9d34bfcdd4ffe92d9d4b7e41 (patch)
treede2e38cb1ddaf45a8b9385ea6effbca3dc736efc /system/rox-filer
parentcd4cf90c0a77ae563adbb7b44c16d09790600931 (diff)
downloadslackbuilds-8467c8e1120b881d9d34bfcdd4ffe92d9d4b7e41.tar.gz
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')
-rw-r--r--system/rox-filer/README3
-rw-r--r--system/rox-filer/doinst.sh26
-rw-r--r--system/rox-filer/rox-filer.SlackBuild26
3 files changed, 28 insertions, 27 deletions
diff --git a/system/rox-filer/README b/system/rox-filer/README
index 032071d9e5..2be5300148 100644
--- a/system/rox-filer/README
+++ b/system/rox-filer/README
@@ -1,4 +1,5 @@
ROX-Filer is a fast and powerful graphical file manager. It has full
drag-and-drop support and background file operations, and is highly
configurable. It can also act as a pinboard, allowing you to pin
-frequently used files to the desktop background.
+frequently used files to the desktop background (i.e., can provide
+desktop icons).
diff --git a/system/rox-filer/doinst.sh b/system/rox-filer/doinst.sh
index 84a3539df9..3f20c43735 100644
--- a/system/rox-filer/doinst.sh
+++ b/system/rox-filer/doinst.sh
@@ -11,6 +11,17 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
+
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
@@ -19,20 +30,11 @@ if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
-# Keep same perms on profile scripts
-if [ -e etc/profile.d/rox-filer.sh ]; then
- cp -a etc/profile.d/rox-filer.sh etc/profile.d/rox-filer.sh.new.incoming
- cat etc/profile.d/rox-filer.sh.new > etc/profile.d/rox-filer.sh.new.incoming
- mv etc/profile.d/rox-filer.sh.new.incoming etc/profile.d/rox-filer.sh.new
-fi
-if [ -e etc/profile.d/rox-filer.csh ]; then
- cp -a etc/profile.d/rox-filer.csh etc/profile.d/rox-filer.csh.new.incoming
- cat etc/profile.d/rox-filer.csh.new > etc/profile.d/rox-filer.csh.new.incoming
- mv etc/profile.d/rox-filer.csh.new.incoming etc/profile.d/rox-filer.csh.new
-fi
-
config etc/rox/xdg/rox.sourceforge.net/MIME-types/application_postscript.new
config etc/rox/xdg/rox.sourceforge.net/MIME-types/text.new
config etc/rox/xdg/rox.sourceforge.net/MIME-types/text_html.new
config etc/profile.d/rox-filer.sh.new
config etc/profile.d/rox-filer.csh.new
+
+preserve_perms etc/profile.d/rox-filer.sh.new
+preserve_perms etc/profile.d/rox-filer.csh.new
diff --git a/system/rox-filer/rox-filer.SlackBuild b/system/rox-filer/rox-filer.SlackBuild
index 754029123a..3b624d0497 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