File tree Expand file tree Collapse file tree 4 files changed +11
-9
lines changed
Expand file tree Collapse file tree 4 files changed +11
-9
lines changed Original file line number Diff line number Diff line change 33set -euo pipefail
44
55# Normalize TMPDIR so it has no trailing slash
6+ TMPDIR=" ${TMPDIR:-/ tmp} "
67TMPDIR=" ${TMPDIR%/ } "
7- DOWNLOAD_DIR=" ${ TMPDIR:-/ tmp} /codenameone-tools"
8+ DOWNLOAD_DIR=" $TMPDIR /codenameone-tools"
89ENV_DIR=" $DOWNLOAD_DIR /tools"
910
1011if [ -f " $ENV_DIR /env.sh" ]; then
@@ -18,10 +19,6 @@ if ! "${JAVA_HOME_11:-}/bin/java" -version 2>&1 | grep -q '11\.0'; then
1819 echo " Failed to provision JDK 11" >&2
1920 exit 1
2021fi
21- if ! " ${JAVA_HOME_17:- } /bin/java" -version 2>&1 | grep -q ' 17\.0' ; then
22- ./scripts/setup-workspace.sh -q -DskipTests
23- source " $ROOT /tools/env.sh"
24- fi
2522if ! " ${JAVA_HOME_17:- } /bin/java" -version 2>&1 | grep -q ' 17\.0' ; then
2623 echo " Failed to provision JDK 17" >&2
2724 exit 1
Original file line number Diff line number Diff line change @@ -11,8 +11,9 @@ if ! command -v xcodebuild >/dev/null; then
1111fi
1212
1313# Normalize TMPDIR so it has no trailing slash
14+ TMPDIR=" ${TMPDIR:-/ tmp} "
1415TMPDIR=" ${TMPDIR%/ } "
15- DOWNLOAD_DIR=" ${ TMPDIR:-/ tmp} /codenameone-tools"
16+ DOWNLOAD_DIR=" $TMPDIR /codenameone-tools"
1617ENV_DIR=" $DOWNLOAD_DIR /tools"
1718
1819if [ -f " $ENV_DIR /env.sh" ]; then
Original file line number Diff line number Diff line change @@ -10,10 +10,10 @@ log() {
1010}
1111
1212# Normalize TMPDIR so it has no trailing slash
13- TMPDIR=" ${TMPDIR%/ } "
14-
1513# Place downloaded tools outside the repository so it isn't filled with binaries
16- DOWNLOAD_DIR=" ${TMPDIR:-/ tmp} /codenameone-tools"
14+ TMPDIR=" ${TMPDIR:-/ tmp} "
15+ TMPDIR=" ${TMPDIR%/ } "
16+ DOWNLOAD_DIR=" $TMPDIR /codenameone-tools"
1717mkdir -p " $DOWNLOAD_DIR "
1818ENV_DIR=" $DOWNLOAD_DIR /tools"
1919mkdir -p " $ENV_DIR "
Original file line number Diff line number Diff line change 1+ export JAVA_HOME=" /var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/jdk8u462-b08/Contents/Home"
2+ export JAVA_HOME_17=" /var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/jdk-17.0.16+8/Contents/Home"
3+ export MAVEN_HOME=" /var/folders/zk/c7v7vr9d4s98dkx18yc7by7c0000gn/T//codenameone-tools/apache-maven-3.9.6"
4+ export PATH=" $JAVA_HOME /bin:$MAVEN_HOME /bin:$PATH "
You can’t perform that action at this time.
0 commit comments