From 1a4c75d1830e37379051d887226cd1e4033ef7aa Mon Sep 17 00:00:00 2001 From: napoly Date: Sun, 10 Mar 2024 15:14:04 +0100 Subject: [PATCH] Fix shell script execution (#808) --- build.gradle | 4 +- gradle/verification-metadata.xml | 75 ++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b6bf4abfba..692bfad741 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' classpath 'com.google.gradle:osdetector-gradle-plugin:1.7.3' classpath 'com.github.johnrengelman:shadow:8.1.1' - classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.6.3' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.2.3' classpath 'com.gradle:gradle-enterprise-gradle-plugin:3.16.1' // added for windows build verification-metadata.xml error } } @@ -169,7 +169,7 @@ configure([project(':cli'), def unixScriptFile = file("${rootProject.projectDir}/haveno-$applicationName") unixScriptFile.text = unixScriptFile.text.replace( - 'APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit', 'APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit') + 'APP_HOME=$( cd "${APP_HOME:-./}.." > /dev/null && pwd -P ) || exit', 'APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit') if (applicationName == 'desktop') { def script = file("${rootProject.projectDir}/haveno-$applicationName") diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c79dc4493b..ddf6dda807 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -136,6 +136,11 @@ + + + + + @@ -154,6 +159,11 @@ + + + + + @@ -167,6 +177,11 @@ + + + + + @@ -204,6 +219,11 @@ + + + + + @@ -1506,6 +1526,11 @@ + + + + + @@ -1698,11 +1723,21 @@ + + + + + + + + + + @@ -1951,6 +1986,11 @@ + + + + + @@ -1971,6 +2011,11 @@ + + + + + @@ -1981,6 +2026,11 @@ + + + + + @@ -3258,6 +3308,11 @@ + + + + + @@ -3292,6 +3347,11 @@ + + + + + @@ -3369,6 +3429,11 @@ + + + + + @@ -3389,6 +3454,11 @@ + + + + + @@ -3399,6 +3469,11 @@ + + + + +