From e1a60f10a578712eccc17875fb58d53f250cca1b Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 28 Apr 2021 23:15:45 -0400 Subject: [PATCH] bundle autoupdate somehow bin/stopwatch.sh is not executable fix #2601 --- java_console/bin/update_bundle.sh | 5 ++++- java_console/bin/update_bundle_release.sh | 5 ++++- .../shared_io/src/main/java/com/rusefi/shared/FileUtil.java | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/java_console/bin/update_bundle.sh b/java_console/bin/update_bundle.sh index 6a70d573ba..860cfcdd4b 100755 --- a/java_console/bin/update_bundle.sh +++ b/java_console/bin/update_bundle.sh @@ -1,4 +1,7 @@ #!/bin/bash cd console -java -jar rusefi_autoupdate.jar version \ No newline at end of file +java -jar rusefi_autoupdate.jar version + +# https://github.com/rusefi/rusefi/issues/2601 +chmod +x bin/*.sh diff --git a/java_console/bin/update_bundle_release.sh b/java_console/bin/update_bundle_release.sh index 2237af6e6b..4ef90e82ca 100755 --- a/java_console/bin/update_bundle_release.sh +++ b/java_console/bin/update_bundle_release.sh @@ -2,4 +2,7 @@ cd console java -jar rusefi_autoupdate.jar release -echo Release update done. \ No newline at end of file +echo Release update done. + +# https://github.com/rusefi/rusefi/issues/2601 +chmod +x bin/*.sh diff --git a/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java b/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java index 033b66c919..cca7b6834a 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java +++ b/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java @@ -12,6 +12,11 @@ public class FileUtil { ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName)); ZipEntry zipEntry = zis.getNextEntry(); while (zipEntry != null) { + /** + * drama: java API does not have access to file permission meta info + * apache commons compress does + * https://stackoverflow.com/questions/1050560/maintain-file-permissions-when-extracting-from-a-zip-file-using-jdk-5-api + */ File newFile = newFile(destDir, zipEntry); if (zipEntry.isDirectory()) { if (!newFile.isDirectory()) {