diff --git a/ant.sh b/ant.sh index 9643569..943b300 100755 --- a/ant.sh +++ b/ant.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=apache-ant-1.10.10-bin.tar.gz URL=https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.10-bin.tar.gz @@ -66,9 +63,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -93,9 +87,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -115,6 +106,8 @@ if [[ ! -d "${JDK_17_DIR}" ]]; then RUN_INSTALL="true" fi export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" if [[ "$RUN_INSTALL" == "true" ]]; then "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -emacs -buildfile "${FR_DIR}build.xml" install diff --git a/build.xml b/build.xml index 24d73a1..1021054 100644 --- a/build.xml +++ b/build.xml @@ -1077,7 +1077,9 @@ export JAVA_HOME="$${JDK_11_DIR}" export JAVA_HOME="$${JDK_17_DIR}" -export JAVA_HOME="$${JDK_21_DIR}" +export JAVA_HOME="$${JDK_21_DIR}" +chmod +x "$${JDK_21_DIR}/lib/jspawnhelper" + # ${maven.remark.line1} # ${maven.remark.line2} @@ -1159,10 +1161,7 @@ if [[ ! -d "$${FR_DIR}$${DIR}/" ]]; then exit $$retVal fi - mv "$${FR_DIR}build/tmp/$${DIR}//$${SUB}" "$${FR_DIR}$${DIR}" - if [[ -f "$${FR_DIR}$${DIR}/lib/jspawnhelper" ]]; then - chmod +x "$${FR_DIR}$${DIR}/lib/jspawnhelper" - fi + mv "$${FR_DIR}build/tmp/$${DIR}//$${SUB}" "$${FR_DIR}$${DIR}" RUN_INSTALL="true" fi diff --git a/env.sh b/env.sh index 9ed290d..5088c7d 100755 --- a/env.sh +++ b/env.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi RUN_INSTALL="true" fi ZIP=apache-ant-1.10.10-bin.tar.gz @@ -67,9 +64,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -94,9 +88,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -119,6 +110,8 @@ if [[ ! -d "${FR_DIR}build/apache-maven-3.9.5" ]]; then RUN_INSTALL="true" fi export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" if [[ "$RUN_INSTALL" == "true" ]]; then "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -emacs -buildfile "${FR_DIR}build.xml" install diff --git a/mvn.sh b/mvn.sh index 45f2a37..5b3625f 100755 --- a/mvn.sh +++ b/mvn.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi RUN_INSTALL="true" fi ZIP=apache-ant-1.10.10-bin.tar.gz @@ -67,9 +64,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -94,9 +88,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar diff --git a/rerun.sh b/rerun.sh index 568ae85..0f67c1e 100755 --- a/rerun.sh +++ b/rerun.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=apache-ant-1.10.10-bin.tar.gz URL=https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.10-bin.tar.gz @@ -66,9 +63,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -93,9 +87,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -106,5 +97,7 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9" JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7" JDK_21_DIR="${FR_DIR}build/jdk-21.0.1+12" export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" rerun \ No newline at end of file diff --git a/restart.sh b/restart.sh index 43f3670..7523d28 100755 --- a/restart.sh +++ b/restart.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=apache-ant-1.10.10-bin.tar.gz URL=https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.10-bin.tar.gz @@ -66,9 +63,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -93,9 +87,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -106,5 +97,7 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9" JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7" JDK_21_DIR="${FR_DIR}build/jdk-21.0.1+12" export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" restart \ No newline at end of file diff --git a/run.sh b/run.sh index 1488fcd..55a159c 100755 --- a/run.sh +++ b/run.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=apache-ant-1.10.10-bin.tar.gz URL=https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.10-bin.tar.gz @@ -66,9 +63,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -93,9 +87,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -106,5 +97,7 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9" JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7" JDK_21_DIR="${FR_DIR}build/jdk-21.0.1+12" export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" run \ No newline at end of file diff --git a/start.sh b/start.sh index 4cb0ceb..8abd812 100755 --- a/start.sh +++ b/start.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=apache-ant-1.10.10-bin.tar.gz URL=https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.10-bin.tar.gz @@ -66,9 +63,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -93,9 +87,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -106,5 +97,7 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9" JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7" JDK_21_DIR="${FR_DIR}build/jdk-21.0.1+12" export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" start \ No newline at end of file diff --git a/stop.sh b/stop.sh index 887adc7..daf9225 100755 --- a/stop.sh +++ b/stop.sh @@ -39,9 +39,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=apache-ant-1.10.10-bin.tar.gz URL=https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.10-bin.tar.gz @@ -66,9 +63,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi ZIP=rhino-1.7.14.zip URL=https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip @@ -93,9 +87,6 @@ if [[ ! -d "${FR_DIR}${DIR}/" ]]; then exit $retVal fi mv "${FR_DIR}build/tmp/${DIR}//${SUB}" "${FR_DIR}${DIR}" - if [[ -f "${FR_DIR}${DIR}/lib/jspawnhelper" ]]; then - chmod +x "${FR_DIR}${DIR}/lib/jspawnhelper" - fi fi if [[ ! -f "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-1.7.14.jar" ]]; then rm "${FR_DIR}build/apache-ant-1.10.10/lib/rhino-"*.jar @@ -106,5 +97,7 @@ JDK_11_DIR="${FR_DIR}build/jdk-11.0.21+9" JDK_17_DIR="${FR_DIR}build/jdk-17.0.8+7" JDK_21_DIR="${FR_DIR}build/jdk-21.0.1+12" export JAVA_HOME="${JDK_21_DIR}" +chmod +x "${JDK_21_DIR}/lib/jspawnhelper" + export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10" "${FR_DIR}build/apache-ant-1.10.10/bin/ant" -Dfr.jdk.8.dir="${JDK_8_DIR}" -Dfr.jdk.11.dir="${JDK_11_DIR}" -Dfr.jdk.17.dir="${JDK_17_DIR}" -Dfr.jdk.21.dir="${JDK_21_DIR}" -emacs -buildfile "${FR_DIR}build.xml" "$@" stop \ No newline at end of file