Commit d395b8ac authored by Ryan Berkheimer's avatar Ryan Berkheimer
Browse files

modifying install scripts to not expand paths when updating bashrc.

parent d3e0e479
Pipeline #5809 failed with stage
in 0 seconds
......@@ -19,8 +19,7 @@ update_ld_library_paths () {
echo "Updating LD_LIBRARY_PATH with locations for libjli and libjvm in bashrc."
sed '/#messageapi_jvm_ld_library_path/d' "${BASHRC}" > "${BASHRC_TMP}"
mv "${BASHRC_TMP}" "${BASHRC}"
echo "export LD_LIBRARY_PATH=${java_jli}:${java_jvm}:$LD_LIBRARY_PATH #messageapi_jvm_ld_library_path" >> "${BASHRC}"
export LD_LIBRARY_PATH=${java_jli}:${java_jvm}:$LD_LIBRARY_PATH
echo "export LD_LIBRARY_PATH=${java_jli}:${java_jvm}:\$LD_LIBRARY_PATH #messageapi_jvm_ld_library_path" >> "${BASHRC}"
echo "Successfully updated LD_LIBRARY_PATH in ${BASHRC}"
else
echo "Could not find the libjli or libjvm folders. C/C++ lib will not work correctly."
......@@ -58,7 +57,7 @@ update_libs_var () {
export MESSAGEAPI_LIBS=${LIBS_INSTALL_DIR}
sed '/#messageapi_c_cpp_ld_library_path/d' "${BASHRC}" > "${BASHRC_TMP}"
mv "${BASHRC_TMP}" "${BASHRC}"
echo "export LD_LIBRARY_PATH=${MESSAGEAPI_LIBS}:${LD_LIBRARY_PATH} #messageapi_c_cpp_ld_library_path" >> "${BASHRC}"
echo "export LD_LIBRARY_PATH=${MESSAGEAPI_LIBS}:\$LD_LIBRARY_PATH #messageapi_c_cpp_ld_library_path" >> "${BASHRC}"
echo "Added a 'MESSAGEAPI_LIBS' environment variable to ${BASHRC} for convenient inclusion of the C/C++ shared library."
echo "Updated the LD_LIBRARY_PATH environment variable to include the MESSAGEAPI_LIBS path."
echo "When creating a C/C++ program that uses the MessageAPI session library, you can use the MESSAGEAPI_LIBS as the linking location."
......
......@@ -5,7 +5,7 @@ update_classpath_var () {
echo "Updating the CLASSPATH environment variable in $(whoami)'s ~/.bashrc."
sed '/#messageapi_core_set_classpath/d' "${BASHRC}" > "${BASHRC_TMP}"
mv "${BASHRC_TMP}" "${BASHRC}"
echo "export CLASSPATH=${CORE_INSTALL_DIR}/${JAR_NAME}:$CLASSPATH #messageapi_core_set_classpath" >> "${BASHRC}"
echo "export CLASSPATH=${CORE_INSTALL_DIR}/${JAR_NAME}:\$CLASSPATH #messageapi_core_set_classpath" >> "${BASHRC}"
echo ""
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment