Mentions légales du service

Skip to content
Snippets Groups Projects
Commit eb363e61 authored by hhakim's avatar hhakim
Browse files

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
...@@ -15,7 +15,7 @@ else ...@@ -15,7 +15,7 @@ else
MATLAB_BIN="${MATLAB_ROOT}/bin/matlab" MATLAB_BIN="${MATLAB_ROOT}/bin/matlab"
STARTUP_DIR="${MATLAB_ROOT}/toolbox/local/" STARTUP_DIR="${MATLAB_ROOT}/toolbox/local/"
STARTUP_FILE=${STARTUP_DIR}/startup.m 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@" 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 #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}" ]] if [[ -d "${FAUST_MATLAB_WRAPPER_PATH}" ]]
...@@ -32,8 +32,9 @@ else ...@@ -32,8 +32,9 @@ else
#then #then
if [[ -r "$USR_STARTUP_FILE" ]] if [[ -r "$USR_STARTUP_FILE" ]]
then 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 echo "addpath(genpath('"$FAUST_MATLAB_WRAPPER_PATH"'))" >> $USR_STARTUP_FILE
chown $USER $USR_STARTUP_FILE
RET2=$(($?+$RET2)) RET2=$(($?+$RET2))
fi fi
#fi #fi
......
...@@ -10,7 +10,7 @@ else ...@@ -10,7 +10,7 @@ else
# set path in system startup script # set path in system startup script
STARTUP_DIR="${MATLAB_ROOT}/toolbox/local/" STARTUP_DIR="${MATLAB_ROOT}/toolbox/local/"
STARTUP_FILE=${STARTUP_DIR}/startup.m 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@" FAUST_MATLAB_WRAPPER_PATH="@CMAKE_INSTALL_MATLAB_PREFIX@"
echo "addpath(genpath('"$FAUST_MATLAB_WRAPPER_PATH"'))" >> $STARTUP_FILE echo "addpath(genpath('"$FAUST_MATLAB_WRAPPER_PATH"'))" >> $STARTUP_FILE
# set path in user startup script # set path in user startup script
...@@ -23,8 +23,9 @@ else ...@@ -23,8 +23,9 @@ else
#then #then
if [[ -r "$USR_STARTUP_FILE" ]] if [[ -r "$USR_STARTUP_FILE" ]]
then 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" echo "addpath(genpath('"$FAUST_MATLAB_WRAPPER_PATH"'))" >> "$USR_STARTUP_FILE"
chown $USER "$USR_STARTUP_FILE"
fi fi
#fi #fi
done done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment