Skip to content

#1242: fixed edition handling #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2023
Merged

#1242: fixed edition handling #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba8899
#1242: fixed edition handling
hohwille Jul 10, 2023
95a7347
Merge branch 'master' into feature/1242-legacy-editions
hohwille Jul 10, 2023
3011771
Merge branch 'master' into feature/1242-legacy-editions
hohwille Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions scripts/src/main/resources/scripts/command/docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ function doSetup() {
then
doFail "It seems that you are running the setup from inside a WSL shell.\nPlease use git-bash for that purpose. Otherwise your OS will be interpreted as Linux"
fi
if [ "${DOCKER_EDITION}" = "DOCKERDESKTOP" ]
then
doWarning "You are still using the legacy property value 'DOCKERDESKTOP' for DOCKER_EDITION.\nThe new property value name is 'docker' as described in the documentation.\nPlease update your devon.properties (what should have happened automatically on update of devonfw-ide scripts)."
DOCKER_EDITION="docker"
fi
if [ "${DOCKER_EDITION}" != "docker" ]
then
DOCKER_EDITION="rancher"
Expand Down
10 changes: 9 additions & 1 deletion scripts/src/main/resources/scripts/command/eclipse
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,15 @@ function doSetup() {
fi
fi
fi
doInstall "eclipse" "${ECLIPSE_VERSION}" "${silent}" "${ECLIPSE_EDITION_TYPE:-java}"
if [ -z "${ECLIPSE_EDITION}" ] && [ -n "${ECLIPSE_EDITION_TYPE}" ]
then
doWarning "You are still using the legacy property ECLIPSE_EDITION_TYPE.\nThe new property name is ECLIPSE_EDITION with values 'eclipse' (default java edition) or 'cpp' as described in the documentation.\nPlease update your devon.properties (what should have happened automatically on update of devonfw-ide scripts)."
if [ "${ECLIPSE_EDITION_TYPE}" = "java" ]
then
ECLIPSE_EDITION="eclipse"
fi
fi
doInstall "eclipse" "${ECLIPSE_VERSION}" "${silent}" "${ECLIPSE_EDITION}"
if [ "${?}" = 0 ]
then
doAddPlugins
Expand Down
10 changes: 9 additions & 1 deletion scripts/src/main/resources/scripts/command/intellij
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ cd "${DEVON_IDE_HOME}" || exit 255

function doSetup() {
doDevonCommand java setup silent
doInstall "intellij" "${INTELLIJ_VERSION}" "${1}" "${INTELLIJ_EDITION_TYPE:-C}"
if [ -z "${INTELLIJ_EDITION}" ] && [ -n "${INTELLIJ_EDITION_TYPE}" ]
then
doWarning "You are still using the legacy property INTELLIJ_EDITION_TYPE.\nThe new property name is INTELLIJ_EDITION with values 'ultimate' or 'intellij' as described in the documentation.\nPlease update your devon.properties (what should have happened automatically on update of devonfw-ide scripts)."
if [ "${INTELLIJ_EDITION_TYPE}" = "U" ]
then
INTELLIJ_EDITION="ultimate"
fi
fi
doInstall "intellij" "${INTELLIJ_VERSION}" "${1}" "${INTELLIJ_EDITION}"
if [ "${?}" = 0 ]
then
if [ -f "${IDEA_HOME}/bin/idea.sh" ]
Expand Down