[med-svn] [imagej] 10/10: Do not create empty plugins, luts, macros directories.

[Carnë Draug]

This is an automated email from the git hooks/post-receive script.

carandraug-guest pushed a commit to branch master
in repository imagej.

commit 75825e8a1ae1015280f874bffc8c046c91f8db2d
Author: Carnë Draug <carandraug+dev at gmail.com>
Date:   Sat Aug 26 17:15:37 2017 +0100

    Do not create empty plugins, luts, macros directories.
---
 debian/changelog                |  2 ++
 debian/dirs                     |  3 ---
 debian/extra/imagej             | 38 +++++++++++++++++---------------------
 debian/imagej.lintian-overrides | 12 ------------
 4 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c003764..2de9ded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ imagej (1.51p+dfsg-1) UNRELEASED; urgency=medium
   * Replaced dependency on openjdk-7 with a virtual package for a
     java-runtime.  This is part of Debian Java policy and gives the choice
     of using an alternative runtime.
+  * The macros, plugins, and luts directories in the imagej directory are
+    empty and so no longer created.
 
  -- Andreas Tille <tille at debian.org>  Sat, 12 Aug 2017 00:29:11 +0200
 
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 8114c28..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/imagej/macros
-usr/share/imagej/plugins
-usr/share/imagej/luts
diff --git a/debian/extra/imagej b/debian/extra/imagej
index 02250c8..0dc6316 100755
--- a/debian/extra/imagej
+++ b/debian/extra/imagej
@@ -117,11 +117,6 @@ elif [[ `uname` == 'Linux' ]] ; then
     fi
 fi
 
-# create plugins,macro,tmp dirs
-mkdir -p $ij_user_path/plugins
-mkdir -p $ij_user_path/macros
-mkdir -p $ij_user_path/luts
-
 # create imagej socket-lock directory if non existant
 if [[ ! -d "$ij_tmp" ]] ; then
     mkdir -p "$ij_tmp"
@@ -141,27 +136,28 @@ fi
 # done
 
 # makes symbolik links from shared plugins, macros and luts
+# create plugins,macro,tmp dirs
+mkdir -p $ij_user_path/plugins
+mkdir -p $ij_user_path/macros
+mkdir -p $ij_user_path/luts
 
-ls /usr/share/imagej/plugins | while read p ; do
-    if [ ! -e "$ij_user_path/plugins/$p" ] ; then
-        ln -s /usr/share/imagej/plugins/$p $ij_user_path/plugins/$p
-    fi
-done
-
-ls /usr/share/imagej/macros | while read p; do
-    if [ ! -e "$ij_user_path/macros/$p" ] ; then
-        ln -s "/usr/share/imagej/macros/$p" "$ij_user_path/macros/$p"
-    fi
-done
-
-ls /usr/share/imagej/luts | while read p ; do
-    if [ ! -e "$ij_user_path/luts/$p" ] ; then
-        ln -s /usr/share/imagej/luts/$p $ij_user_path/luts/$p
+for ij_subdir in plugins macros luts ; do
+    ij_system_subdir="/usr/share/imagej/$ij_subdir"
+    ij_user_subdir="$ij_user_path/$ij_subdir"
+    mkdir -p "$ij_user_subdir"
+    ## This directories may not exist since a plain ImageJ
+    ## installation does not even have them.
+    if [ ! -d "$ij_system_subdir" ] ; then
+        continue
     fi
+    ls "$ij_system_subdir" | while read p ; do
+        if [ ! -e "$ij_user_subdir/$p" ] ; then
+            ln -s "$ij_system_subdir/$p" "$ij_user_subdir/$p"
+        fi
+    done
 done
 
 
-
 ##################### USAGE DESCRIPTION #####################
 
 function usage {
diff --git a/debian/imagej.lintian-overrides b/debian/imagej.lintian-overrides
deleted file mode 100644
index 0aa2e7f..0000000
--- a/debian/imagej.lintian-overrides
+++ /dev/null
@@ -1,12 +0,0 @@
-# We want this empty directories so that users, sysadmin, and other
-# packages can drop new macros, plugins, and luts inside.  Upstream
-# binary releases also comes with this directories.  Upstream did not
-# have them empty but: the two plugins inside were MacOS specific,
-# cannot be built from source, and so have been removed; the luts are
-# for some reason not included in the source release; the macros that
-# are part of the source release are included in the jar file while
-# the ones in the directory are like the luts, missing in the source
-# release.
-imagej: package-contains-empty-directory usr/share/imagej/macros/
-imagej: package-contains-empty-directory usr/share/imagej/plugins/
-imagej: package-contains-empty-directory usr/share/imagej/luts/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/imagej.git