From f05b265627f7f019bc743463b565d2cedb486989 Mon Sep 17 00:00:00 2001 From: Vladlen Chekunov Date: Mon, 7 Apr 2025 11:33:35 +0300 Subject: [PATCH] Make removing and inserting injection variables more simple and understandable. --- script/install.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/script/install.sh b/script/install.sh index c7acaef..b491eae 100755 --- a/script/install.sh +++ b/script/install.sh @@ -68,18 +68,25 @@ for PRD in $JB_PRODUCTS; do fi done +# Remove prevoius injected lines if exists if [ $OS_NAME = "Darwin" ]; then - sed -i '' '/___MY_VMOPTIONS_SHELL_FILE="${HOME}\/\.jetbrains\.vmoptions\.sh"; if /d' "${PROFILE_PATH}" >/dev/null 2>&1 - sed -i '' '/___MY_VMOPTIONS_SHELL_FILE="${HOME}\/\.jetbrains\.vmoptions\.sh"; if /d' "${BASH_PROFILE_PATH}" >/dev/null 2>&1 - sed -i '' '/___MY_VMOPTIONS_SHELL_FILE="${HOME}\/\.jetbrains\.vmoptions\.sh"; if /d' "${ZSH_PROFILE_PATH}" >/dev/null 2>&1 + sed -i '' '/___MY_VMOPTIONS_SHELL_FILE=/d' "${PROFILE_PATH}" >/dev/null 2>&1 + sed -i '' '/___MY_VMOPTIONS_SHELL_FILE=/d' "${BASH_PROFILE_PATH}" >/dev/null 2>&1 + sed -i '' '/___MY_VMOPTIONS_SHELL_FILE=/d' "${ZSH_PROFILE_PATH}" >/dev/null 2>&1 echo 'RunAtLoad' >>"${PLIST_PATH}" else - { sed -i '' -e '$a\' -e '/___MY_VMOPTIONS_SHELL_FILE="${HOME}\/\.jetbrains\.vmoptions\.sh"; if /d' "${PROFILE_PATH}"; } >/dev/null 2>&1 - { sed -i '' -e '$a\' -e '/___MY_VMOPTIONS_SHELL_FILE="${HOME}\/\.jetbrains\.vmoptions\.sh"; if /d' "${BASH_PROFILE_PATH}"; } >/dev/null 2>&1 - { sed -i '' -e '$a\' -e '/___MY_VMOPTIONS_SHELL_FILE="${HOME}\/\.jetbrains\.vmoptions\.sh"; if /d' "${ZSH_PROFILE_PATH}"; } >/dev/null 2>&1 + sed -i '/___MY_VMOPTIONS_SHELL_FILE=/d' "${PROFILE_PATH}" >/dev/null 2>&1 + sed -i '/___MY_VMOPTIONS_SHELL_FILE=/d' "${BASH_PROFILE_PATH}" >/dev/null 2>&1 + sed -i '/___MY_VMOPTIONS_SHELL_FILE=/d' "${ZSH_PROFILE_PATH}" >/dev/null 2>&1 fi +# Inject new lines +echo "${EXEC_LINE}" >>"${PROFILE_PATH}" +echo "${EXEC_LINE}" >>"${BASH_PROFILE_PATH}" +echo "${EXEC_LINE}" >>"${ZSH_PROFILE_PATH}" + +# Inject to snap if snap exists if command -v snap >/dev/null 2>&1; then echo 'snap found. put environment variables.' @@ -89,10 +96,6 @@ if command -v snap >/dev/null 2>&1; then done fi -echo "${EXEC_LINE}" >>"${PROFILE_PATH}" -echo "${EXEC_LINE}" >>"${BASH_PROFILE_PATH}" -echo "${EXEC_LINE}" >>"${ZSH_PROFILE_PATH}" - if [ $OS_NAME = "Darwin" ]; then echo 'done. the "kill Dock" command can fix the crash issue.' else