diff options
author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-16 16:38:21 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-16 16:38:41 +0700 |
commit | 8882b9e25f4e3460133a5567d06972e5cedfc45e (patch) | |
tree | e2722383972bbf60c88447aeb3cb0ce4434dfafb | |
parent | f97638282c2a5db5a0dc02027c26c7c710f32153 (diff) | |
download | slackbuilds-8882b9e25f4e3460133a5567d06972e5cedfc45e.tar.gz |
network/tor-browser: Simplify SlackBuild script.
Thanks to Thomas Morper.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r-- | network/tor-browser/mozicon128.png | bin | 0 -> 19033 bytes | |||
-rw-r--r-- | network/tor-browser/tor-browser.SlackBuild | 26 |
2 files changed, 2 insertions, 24 deletions
diff --git a/network/tor-browser/mozicon128.png b/network/tor-browser/mozicon128.png Binary files differnew file mode 100644 index 0000000000..8fc3530cff --- /dev/null +++ b/network/tor-browser/mozicon128.png diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild index 227c058798..85c43c5e63 100644 --- a/network/tor-browser/tor-browser.SlackBuild +++ b/network/tor-browser/tor-browser.SlackBuild @@ -41,21 +41,9 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - SRCARCH=32 -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - SRCARCH=32 -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" +if [ "$ARCH" = "x86_64" ]; then SRCARCH=64 else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" SRCARCH=32 fi @@ -64,18 +52,8 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${PRGNAM}_${PRGLANG} -tar xvf $CWD/${PRGNAM}-linux${SRCARCH}-${VERSION}_${PRGLANG}.tar.xz -cd ${PRGNAM}_${PRGLANG} -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG/opt/ -mv * $PKG/opt/ mkdir -p $PKG/usr/bin install -m 0755 $CWD/tor-browser.sh $PKG/usr/bin/tor-browser @@ -89,7 +67,7 @@ mkdir -p $PKG/opt/$PRGNAM install -m 0644 $CWD/${PRGNAM}-linux${SRCARCH}-${VERSION}_${PRGLANG}.tar.xz $PKG/opt/$PRGNAM mkdir -p $PKG/usr/share/pixmaps -install -m 0644 $PKG/opt/Browser/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/tor-browser.png +install -m 0644 $CWD/mozicon128.png $PKG/usr/share/pixmaps/tor-browser.png mkdir -p $PKG/usr/share/applications/ install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/ |