Skip to content

resolve merge conflict: apply PR #8 fixes to current main #9

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
jimmckeeth merged 1 commit into from
Jun 21, 2026
Merged

resolve merge conflict: apply PR #8 fixes to current main #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions scripts/SetupLinux4Delphi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ while [[ $# -gt 0 ]]; do
echo " 11.2 = Alexandria 11.2"
echo " 11.1 = Alexandria 11.1"
echo " 11.0 = Alexandria 11.0"
echo " 21.0, 10.4.1 = Sydney 10.4.1"
echo " 21.0, 10.4, 10.4.2 = Sydney 10.4.2"
echo " 10.4.1 = Sydney 10.4.1"
echo " 10.4.0 = Sydney 10.4.0"
echo " 20.0, 10.3, 10.3.3 = Rio 10.3.3"
echo " 10.3.2 = Rio 10.3.2"
Expand Down Expand Up @@ -123,7 +124,7 @@ case "$PARAM" in
COMPILER="22.0"
PRODUCT="11.3"
RELEASE="Alexandria"
PASERVER_URL="https://altd.embarcadero.com/releases/studio/22.0/113/LinuxPAServer22.0.tar.gz"
PASERVER_URL="https://altd.embarcadero.com/releases/studio/22.0/1131/LinuxPAServer22.0.tar.gz"
;;
"11.0")
COMPILER="22.0"
Expand All @@ -144,7 +145,13 @@ case "$PARAM" in
PASERVER_URL="https://altd.embarcadero.com/releases/studio/22.0/112/LinuxPAServer22.0.tar.gz"
;;
# Sydney
"10.4"|"10.4.1"|"sydney"|"21.0")
"10.4"|"10.4.2"|"sydney"|"21.0")
COMPILER="21.0"
PRODUCT="10.4.2"
RELEASE="Sydney"
PASERVER_URL="https://altd.embarcadero.com/releases/studio/21.0/2/PAServer/LinuxPAServer21.0.tar.gz"
;;
"10.4.1")
COMPILER="21.0"
PRODUCT="10.4.1"
RELEASE="Sydney"
Expand Down