summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author D Woodfall <dave@slackbuilds.org>2023-05-16 19:51:05 +0100
committer bedlam <dave@slackbuilds.org>2023-05-17 00:58:12 +0100
commit7204ac7dd630bae3aa66f9446dcfdd1f4a2d73bf (patch)
treeb81e2473fbbf2506cb0189ce5713123909c0d78c
parent19e02c41c070c2ab056e563e3cc36453d286d2a8 (diff)
downloadslackbuilds-7204ac7dd630bae3aa66f9446dcfdd1f4a2d73bf.tar.gz
slackbuilds-7204ac7dd630bae3aa66f9446dcfdd1f4a2d73bf.tar.xz
academic/fiji: Fix ARCH section.
Signed-off-by: bedlam <dave@slackbuilds.org>
-rw-r--r--academic/fiji/fiji.SlackBuild21
1 files changed, 9 insertions, 12 deletions
diff --git a/academic/fiji/fiji.SlackBuild b/academic/fiji/fiji.SlackBuild
index 0b127ee6b9..9319735f65 100644
--- a/academic/fiji/fiji.SlackBuild
+++ b/academic/fiji/fiji.SlackBuild
@@ -33,11 +33,14 @@ PKGTYPE=${PKGTYPE:-tgz}
DIRNAM=Fiji.app
if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i386 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
+ ARCH=$( uname -m )
+fi
+
+# Stop if arch is not supported
+# 2023-05-16 DW: better if it's before PRINT_PACKAGE_NAME
+if [ "$ARCH" != "x86_64" ]; then
+ printf "\n$ARCH is not supported... \n"
+ exit 1
fi
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -54,12 +57,6 @@ OUTPUT=${OUTPUT:-/tmp}
set -e
-# Stop if arch is not supported
-if [ "$ARCH" != "i386" ] && [ "$ARCH" != "x86_64" ]; then
- printf "\n\n$ARCH is not supported... \n"
- exit 1
-fi
-
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -128,7 +125,7 @@ $PKG/opt/$PRGNAM
cp $CWD/ImageJ2.desktop $PKG/opt/$PRGNAM
# Install the simple wrapper
-install -D -m755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true