summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-24 01:23:05 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-24 16:10:23 -0500
commitbc3e358cd6a72c1d77451213fa3de42330e78c0e (patch)
tree9893e3791fb47c446fbbd3c3ef30ea6c396355d9
parent9f8925c55a8c595d0f580d8cb9faed72312055ef (diff)
downloadslackbuilds-bc3e358cd6a72c1d77451213fa3de42330e78c0e.tar.gz
network/opera: Miscellaneous cleanups
Note that this will likely be abandoned when the next major opera release is out; I don't use this, and thus I have little desire to keep it up to date.
-rw-r--r--network/opera/opera.SlackBuild17
1 files changed, 14 insertions, 3 deletions
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index d4d712fa3d..797bc0a4fb 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -25,10 +25,19 @@
PRGNAM=opera
VERSION=10.10
-ARCH=${ARCH:-i386}
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=i386 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -38,9 +47,11 @@ set -eu
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
-else
- ARCH=i386
+elif [ "$ARCH" = "i386" ]; then
LIBDIRSUFFIX=""
+else
+ printf "\n\n$ARCH is not supported...\n"
+ exit 1
fi
# Don't bother this - it's for easier manipulation and sed'ing later