Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
base
Commits
9ba303fd
Commit
9ba303fd
authored
4 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
RF: $FSLDIR/share/fsl/bin/ instead of $FSLDIR/share/bin/
parent
b6f388ad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1
Enh/create wrapper
Pipeline
#6221
passed
4 years ago
Stage: fsl-ci-build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
etc/fslconf/createFSLWrapper.sh
+10
-4
10 additions, 4 deletions
etc/fslconf/createFSLWrapper.sh
etc/fslconf/removeFSLWrapper.sh
+2
-2
2 additions, 2 deletions
etc/fslconf/removeFSLWrapper.sh
with
12 additions
and
6 deletions
etc/fslconf/createFSLWrapper.sh
+
10
−
4
View file @
9ba303fd
#!/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
"
...
...
This diff is collapsed.
Click to expand it.
etc/fslconf/removeFSLWrapper.sh
+
2
−
2
View file @
9ba303fd
#!/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
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment