Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
atlasexternals
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Iacopo Vivarelli
atlasexternals
Commits
49c7a8d5
Commit
49c7a8d5
authored
7 years ago
by
Attila Krasznahorkay
Browse files
Options
Downloads
Plain Diff
Merge branch 'ZSHFixes-20170308' into 'master'
ZSH fixes (2017.03.08.) See merge request !8
parents
29c6f8bb
3bf4a597
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Build/AtlasCMake/modules/scripts/setup.sh.in
+2
-2
2 additions, 2 deletions
Build/AtlasCMake/modules/scripts/setup.sh.in
with
2 additions
and
2 deletions
Build/AtlasCMake/modules/scripts/setup.sh.in
+
2
−
2
View file @
49c7a8d5
...
...
@@ -41,7 +41,7 @@ remove_duplicates() {
if [ "$x" != "" ]; then
# If it's an existing directory, get its absolute path:
if [ -d $x ] && [ -r $x ] && [ -x $x ]; then
x=
(
$(\cd $x;\pwd)
)
x=$(\cd $x;\pwd)
fi
# Get the current value of the environment variable:
eval "envval=\$$envname"
...
...
@@ -80,7 +80,7 @@ if [ "x${ENV_VAR_VALUE}" = "x" ]; then
eval "export ${ENV_VAR}=1"
# Set up the project's main directory:
export @CMAKE_PROJECT_NAME@_DIR=
(
$(\cd ${thisdir};\pwd)
)
export @CMAKE_PROJECT_NAME@_DIR=$(\cd ${thisdir};\pwd)
unset thisdir
# Extract directory names relevant for the rest of the operations:
...
...
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