From 4d6da79fb13d03486e9c2f71e48674583fb77d6b Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Wed, 8 Jan 2025 00:05:24 +0530 Subject: [PATCH 1/3] Fix 'bal dist pull' failure in windows --- .../java/org/ballerinalang/command/util/ToolUtil.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/ballerinalang/command/util/ToolUtil.java b/src/main/java/org/ballerinalang/command/util/ToolUtil.java index c133eae..2772a6b 100644 --- a/src/main/java/org/ballerinalang/command/util/ToolUtil.java +++ b/src/main/java/org/ballerinalang/command/util/ToolUtil.java @@ -1033,8 +1033,14 @@ public static String encodePlusCharacters(String dependency) { private static void addExecutablePermissionToDirectory(String filePath) { Process process; try { - process = Runtime.getRuntime().exec("chmod -R 755 " + filePath); - process.waitFor(); + if (OSUtils.isWindows()) { + process = Runtime.getRuntime().exec("icacls " + filePath + " /grant Everyone:(OI)(CI)RX /T"); + process.waitFor(); + } + else { + process = Runtime.getRuntime().exec("chmod -R 755 " + filePath); + process.waitFor(); + } } catch (InterruptedException | IOException e) { throw ErrorUtil.createCommandException("permission denied: you do not have write access to '" + filePath + "'"); From bd92eb8f99e74d32025f288bee4cf1b96fff7e5c Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Wed, 8 Jan 2025 12:03:30 +0530 Subject: [PATCH 2/3] Address review suggestions --- src/main/java/org/ballerinalang/command/util/ToolUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/ballerinalang/command/util/ToolUtil.java b/src/main/java/org/ballerinalang/command/util/ToolUtil.java index 2772a6b..27294c0 100644 --- a/src/main/java/org/ballerinalang/command/util/ToolUtil.java +++ b/src/main/java/org/ballerinalang/command/util/ToolUtil.java @@ -1035,12 +1035,11 @@ private static void addExecutablePermissionToDirectory(String filePath) { try { if (OSUtils.isWindows()) { process = Runtime.getRuntime().exec("icacls " + filePath + " /grant Everyone:(OI)(CI)RX /T"); - process.waitFor(); } else { process = Runtime.getRuntime().exec("chmod -R 755 " + filePath); - process.waitFor(); } + process.waitFor(); } catch (InterruptedException | IOException e) { throw ErrorUtil.createCommandException("permission denied: you do not have write access to '" + filePath + "'"); From becc7a5a85b5115dad71ea8a64686e867b84daa5 Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Wed, 8 Jan 2025 15:22:59 +0530 Subject: [PATCH 3/3] Update version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7a02149..fe83759 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.ballerinalang -version=1.4.5-SNAPSHOT +version=1.5.0-SNAPSHOT ballerinaJreVersion=1.1.0 jreVersion=21.0.5+11-jre