From 9ba303fdfe5b8522fc506629604ff27b75a1623b Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 30 Nov 2020 15:10:15 +0000
Subject: [PATCH] RF: $FSLDIR/share/fsl/bin/ instead of $FSLDIR/share/bin/
---
etc/fslconf/createFSLWrapper.sh | 14 ++++++++++----
etc/fslconf/removeFSLWrapper.sh | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/etc/fslconf/createFSLWrapper.sh b/etc/fslconf/createFSLWrapper.sh
index 101e505..c80f753 100755
--- a/etc/fslconf/createFSLWrapper.sh
+++ b/etc/fslconf/createFSLWrapper.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Create wrapper scripts in $FSLDIR/share/bin/ which invoke commands that
+# Create wrapper scripts in $FSLDIR/share/fsl/bin/ which invoke commands that
# are installed in $FSLDIR/bin/.
#
# This script is used to create isolated versions of all executables
@@ -14,8 +14,8 @@
#
# Early versions of this script would create symlinks from $FSLDIR/bin/ into
# $FSLDIR/fslpython/envs/fslpython/bin/ (and, later, into
-# $FSLDIR/share/bin/). However, wrapper scripts are now used instead to work
-# around a couple of problems:
+# $FSLDIR/share/fsl/bin/). However, wrapper scripts are now used instead to
+# work around a couple of problems:
#
# - We need python executables to exclusively use the libraries installed in
# the FSL conda environment. Users may have other Python environments
@@ -45,12 +45,18 @@ case "$PREFIX" in "$FSLDIR"*)
for script in $targets; do
sourceScript="${PREFIX}/bin/$script"
- targetScript="${FSLDIR}/share/bin/$script"
+ targetScript="${FSLDIR}/share/fsl/bin/$script"
if [ ! -f "$sourceScript" ]; then
continue
fi
+ # create share/fsl/bin/ if it doesn't
+ # already exist
+ if [ ! -e "$FSLDIR/share/fsl/bin" ]; then
+ mkdir -p "$FSLDIR/share/fsl/bin"
+ fi
+
# remove target script if it already exists
if [ -e "$targetScript" ]; then
rm "$targetScript"
diff --git a/etc/fslconf/removeFSLWrapper.sh b/etc/fslconf/removeFSLWrapper.sh
index 625409b..675e598 100755
--- a/etc/fslconf/removeFSLWrapper.sh
+++ b/etc/fslconf/removeFSLWrapper.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Remove wrapper script/links in $FSLDIR/share/bin/ which invoke commands
+# Remove wrapper script/links in $FSLDIR/share/fsl/bin/ which invoke commands
# that are installed in $FSLDIR/bin/. See createFSLWrapper.sh for more
# information.
@@ -14,7 +14,7 @@ fi
case "$PREFIX" in "$FSLDIR"*)
for script in $targets; do
- targetScript="${FSLDIR}/share/bin/$script"
+ targetScript="${FSLDIR}/share/fsl/bin/$script"
if [ -f "$targetScript" ]; then
rm "$targetScript"
--
GitLab