Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
faust
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Admin message
GitLab upgrade completed. Current version is 17.11.4.
Show more breadcrumbs
faust group
faust
Commits
eb363e61
Commit
eb363e61
authored
6 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Fix startup.m overwriting issue in package post-install script (linux/macos).
parent
cc0a8509
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
misc/binpkg_postinst_scripts/debrpm/postinst_matlab.sh.in
+3
-2
3 additions, 2 deletions
misc/binpkg_postinst_scripts/debrpm/postinst_matlab.sh.in
misc/binpkg_postinst_scripts/macosx/postinst_matlab.sh.in
+3
-2
3 additions, 2 deletions
misc/binpkg_postinst_scripts/macosx/postinst_matlab.sh.in
with
6 additions
and
4 deletions
misc/binpkg_postinst_scripts/debrpm/postinst_matlab.sh.in
+
3
−
2
View file @
eb363e61
...
...
@@ -15,7 +15,7 @@ else
MATLAB_BIN
=
"
${
MATLAB_ROOT
}
/bin/matlab"
STARTUP_DIR
=
"
${
MATLAB_ROOT
}
/toolbox/local/"
STARTUP_FILE
=
${
STARTUP_DIR
}
/startup.m
[[
-r
"
$STARTUP_FILE
"
]]
&&
grep
-i
-v
faust
"
$STARTUP_FILE
"
>
"
$STARTUP_FILE
"
2>/dev/null
[[
-r
"
$STARTUP_FILE
"
]]
&&
grep
-i
-v
faust
"
$STARTUP_FILE
"
>
"
$
{
STARTUP_FILE
}
.tmp
"
2>/dev/null
&&
mv
"
${
STARTUP_FILE
}
.tmp"
"
$STARTUP_FILE
"
FAUST_MATLAB_WRAPPER_PATH
=
"@CMAKE_INSTALL_MATLAB_PREFIX@"
#USR_STARTUP_FILE=$($MATLAB_BIN -nojvm -nodisplay -r "which startup;exit" | tail -n 2 | head -n 1) # useless in root
if
[[
-d
"
${
FAUST_MATLAB_WRAPPER_PATH
}
"
]]
...
...
@@ -32,8 +32,9 @@ else
#then
if
[[
-r
"
$USR_STARTUP_FILE
"
]]
then
grep
-i
-v
faust
"
$USR_STARTUP_FILE
"
>
"
$USR_STARTUP_FILE
"
2>/dev/null
grep
-i
-v
faust
"
$USR_STARTUP_FILE
"
>
"
$
{
USR_STARTUP_FILE
}
.tmp
"
2>/dev/null
&&
mv
"
${
USR_STARTUP_FILE
}
.tmp"
"
$USR_STARTUP_FILE
"
echo
"addpath(genpath('"
$FAUST_MATLAB_WRAPPER_PATH
"'))"
>>
$USR_STARTUP_FILE
chown
$USER
$USR_STARTUP_FILE
RET2
=
$((
$?
+
$RET2
))
fi
#fi
...
...
This diff is collapsed.
Click to expand it.
misc/binpkg_postinst_scripts/macosx/postinst_matlab.sh.in
+
3
−
2
View file @
eb363e61
...
...
@@ -10,7 +10,7 @@ else
# set path in system startup script
STARTUP_DIR
=
"
${
MATLAB_ROOT
}
/toolbox/local/"
STARTUP_FILE
=
${
STARTUP_DIR
}
/startup.m
[[
-r
"
$STARTUP_FILE
"
]]
&&
grep
-i
-v
faust
"
$STARTUP_FILE
"
>
"
$STARTUP_FILE
"
[[
-r
"
$STARTUP_FILE
"
]]
&&
grep
-i
-v
faust
"
$STARTUP_FILE
"
>
"
${
STARTUP_FILE
}
.tmp"
&&
mv
"
${
STARTUP_FILE
}
.tmp"
"
$STARTUP_FILE
"
FAUST_MATLAB_WRAPPER_PATH
=
"@CMAKE_INSTALL_MATLAB_PREFIX@"
echo
"addpath(genpath('"
$FAUST_MATLAB_WRAPPER_PATH
"'))"
>>
$STARTUP_FILE
# set path in user startup script
...
...
@@ -23,8 +23,9 @@ else
#then
if
[[
-r
"
$USR_STARTUP_FILE
"
]]
then
grep
-i
-v
faust
"
$USR_STARTUP_FILE
"
>
"
$USR_STARTUP_FILE
"
grep
-i
-v
faust
"
$USR_STARTUP_FILE
"
>
"
${
USR_STARTUP_FILE
}
.tmp"
&&
mv
"
${
USR_STARTUP_FILE
}
.tmp"
"
$USR_STARTUP_FILE
"
echo
"addpath(genpath('"
$FAUST_MATLAB_WRAPPER_PATH
"'))"
>>
"
$USR_STARTUP_FILE
"
chown
$USER
"
$USR_STARTUP_FILE
"
fi
#fi
done
...
...
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