diff --git a/scripts/installer.sh b/scripts/installer.sh index 2ca053e..48a47e6 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -314,6 +314,7 @@ function configRead() { function configWrite() { local O=${G_PARENT}/joeyDev.sh local P=\${JOEYPATH} + local SDKLIST="[" echo "#!/bin/bash" > "${O}" # Remember the initial path so we can run this more than once echo "if [[ -z \$JOEYPATH || \"\${JOEYPATH}\" == \"\" ]]; then" >> "${O}" @@ -321,6 +322,7 @@ function configWrite() { echo "fi" >> "${O}" echo "export JOEY=\"${G_PARENT}\"" >> "${O}" if [[ ${G_IS_INSTALLED[$G_IIGS]} == 1 ]]; then + SDKLIST="${SDKLIST} IIgs" # IIgs Runtime & ORCA Compilers P=\${JOEY}/sdks/IIgs:${P} echo "export GOLDEN_GATE=\"\${JOEY}/sdks/IIgs/ORCA\"" >> "${O}" @@ -329,17 +331,39 @@ function configWrite() { echo "fi" >> "${O}" fi if [[ ${G_IS_INSTALLED[$G_AMIGA]} == 1 ]]; then + SDKLIST="${SDKLIST} Amiga" P=\${JOEY}/sdks/amiga/bin:${P} fi if [[ ${G_IS_INSTALLED[$G_ATARIST]} == 1 ]]; then + SDKLIST="${SDKLIST} ST" P=\${JOEY}/sdks/st/bin:${P} fi if [[ ${G_IS_INSTALLED[$G_MAC32]} == 1 || ${G_IS_INSTALLED[$G_MAC64]} == 1 ]]; then + if [[ ${G_IS_INSTALLED[$G_MAC32]} == 1 ]]; then + SDKLIST="${SDKLIST} MACOS32" + fi + if [[ ${G_IS_INSTALLED[$G_MAC64]} == 1 ]]; then + SDKLIST="${SDKLIST} MACOS64" + fi P=\${JOEY}/sdks/macOS/bin:${P} echo "export MACOSX_DEPLOYMENT_TARGET=${G_OSX_MIN}" >> "${O}" echo "export MACOSX_DARWIN=${G_OSX_DARWIN}" >> "${O}" fi echo "export PATH=\"${P}\"" >> "${O}" + if [[ ${G_IS_INSTALLED[$G_WIN32]} == 1 ]]; then + SDKLIST="${SDKLIST} WIN32" + fi + if [[ ${G_IS_INSTALLED[$G_WIN64]} == 1 ]]; then + SDKLIST="${SDKLIST} WIN64" + fi + if [[ ${G_IS_INSTALLED[$G_LINUX32]} == 1 ]]; then + SDKLIST="${SDKLIST} LINUX32" + fi + if [[ ${G_IS_INSTALLED[$G_LINUX64]} == 1 ]]; then + SDKLIST="${SDKLIST} LINUX64" + fi + SDKLIST="${SDKLIST} ]" + echo "export JOEYLIB_SDKS=\"${SDKLIST}\"" >> "${O}" chmod +x "${O}" }