From 5439426bc8a8f45bf5f1cff07cfc888bd16ff4d3 Mon Sep 17 00:00:00 2001
From: Petar Petrov
Date: Tue, 18 May 2021 16:17:38 +0300
Subject: academic/fiji: update for version 20201104_1356

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/fiji/README          |  2 ++
 academic/fiji/fiji.SlackBuild | 21 ++++++++++++++++-----
 academic/fiji/fiji.info       | 12 ++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'academic/fiji')

diff --git a/academic/fiji/README b/academic/fiji/README
index 873045e097..1b51100f6a 100644
--- a/academic/fiji/README
+++ b/academic/fiji/README
@@ -32,6 +32,8 @@ Fiji is Just ImageJ, with extras. It is a distribution of ImageJ with
 many plugins useful for scientific image analysis in fields such as
 life sciences. It is actively maintained, with updates released often. 
 
+NOTE: This comes with its own Java environment.
+
 Citing
 Schindelin, J.; Arganda-Carreras, I. & Frise, E. et al. (2012)
 "Fiji: an open-source platform for biological-image analysis"
diff --git a/academic/fiji/fiji.SlackBuild b/academic/fiji/fiji.SlackBuild
index 68c84ec4a6..94db198e80 100644
--- a/academic/fiji/fiji.SlackBuild
+++ b/academic/fiji/fiji.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fiji
 
-# Copyright 2018-2020 Petar Petrov slackalaxy@gmail.com
+# Copyright 2018-2021 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -45,16 +45,23 @@ OUTPUT=${OUTPUT:-/tmp}
 set -e
 
 # Stop if arch is not supported
-if [ "$ARCH" != "x86_64" ]; then
+if [ "$ARCH" != "i386" ] && [ "$ARCH" != "x86_64" ]; then
   printf "\n\n$ARCH is not supported... \n"
   exit 1
 fi
 
+# Determine suffix
+if [ "$ARCH" = "x86_64" ]; then
+  SUFFIX=linux64
+else
+  SUFFIX=inux32
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $DIRNAM
-tar xvf $CWD/${PRGNAM}-nojre.tar.gz
+tar xvf $CWD/${PRGNAM}-$SUFFIX.tar.gz
 cd $DIRNAM
 chown -R root:root .
 find -L . \
@@ -64,7 +71,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Rename the binary we need
-mv ImageJ-linux64 $PRGNAM
+mv ImageJ-$SUFFIX $PRGNAM
 
 # We will put here two tools, so they are not run at startup.
 mkdir -p unused
@@ -85,15 +92,19 @@ cd ..
 
 # Update plugins, so that the latest are included in the package. This
 # will download stuff during the package creation, something that is
-# against the policy of SlackBuilds.org. However, it is your system,
+# against the policy of SlackBuilds.org. However, it is _your_ system,
 # so if you _really_ want this, uncomment the line below.
 # ./$PRGNAM --update list-local-only
 
 # Copy the folders, db.xml and the renamed binary to /opt
 mkdir -p $PKG/opt/$PRGNAM
 cp -a \
+  Contents \
   images \
   jars \
+  java \
+  lib \
+  licenses \
   luts \
   macros \
   plugins \
diff --git a/academic/fiji/fiji.info b/academic/fiji/fiji.info
index 20c501e557..9e3928ff4b 100644
--- a/academic/fiji/fiji.info
+++ b/academic/fiji/fiji.info
@@ -1,10 +1,10 @@
 PRGNAM="fiji"
-VERSION="20200902_2101"
+VERSION="20201104_1356"
 HOMEPAGE="https://fiji.sc/"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://downloads.imagej.net/fiji/archive/20200902-2101/fiji-nojre.tar.gz"
-MD5SUM_x86_64="79c19275017206c662c4381dd43f7dc2"
-REQUIRES="jdk"
+DOWNLOAD="https://downloads.imagej.net/fiji/archive/20201104-1356/fiji-linux32.tar.gz"
+MD5SUM="bff409ed4b683d67e3b3ac0d38423f0d"
+DOWNLOAD_x86_64="https://downloads.imagej.net/fiji/archive/20201104-1356/fiji-linux64.tar.gz"
+MD5SUM_x86_64="7141a774a0c759f6fea0875a6cbf58b9"
+REQUIRES=""
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
-- 
cgit v1.2.3