Merge pull request #325 from udda1996/validate-update-cycle

Fix JRE-17 executable permissions
ballerina-platform · Oct 12, 2023 · cbd3693 · cbd3693
2 parents 38ce38e + 2372c8e
commit cbd3693
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/resources/scripts/install b/resources/scripts/install
@@ -55,6 +55,11 @@ then
 \cp $CURRENT_PATH/ballerina-command-@version@/scripts/_bal $CURRENT_PATH/../scripts
 fi
 
+if [ -d "$CURRENT_PATH/../dependencies/jdk-17.0.7+7-jre" ]
+then
+chmod -R 755 $CURRENT_PATH/../dependencies/jdk-17.0.7+7-jre
+fi
+
 if [ $? -ne '0' ]; then
   echo "error occurred while copying completion script files."
 fi

diff --git a/src/main/java/org/ballerinalang/command/util/ToolUtil.java b/src/main/java/org/ballerinalang/command/util/ToolUtil.java
@@ -675,12 +675,7 @@ private static void downloadAndSetupDependency(HttpURLConnection conn, PrintStre
         zipFile = Paths.get(zipFileLocation).toFile();
         downloadFile(conn, zipFileLocation, dependency, printStream);
         unzip(zipFileLocation, dependencyLocation);
-        if(OSUtils.isMac()) {
-            addExecutablePermissionToDirectory(dependencyLocation + File.separator + dependency);
-        } else {
-            addExecutablePermissionToFile(new File(dependencyLocation + File.separator + dependency
-                    + File.separator + "bin" + File.separator + "java"));
-        }
+        addExecutablePermissionToDirectory(dependencyLocation + File.separator + dependency);
         if (zipFile.exists()) {
             zipFile.delete();
         }

diff --git a/src/test/java/org/ballerinalang/distribution/UpdateToolTest.java b/src/test/java/org/ballerinalang/distribution/UpdateToolTest.java
@@ -238,7 +238,7 @@ public void projectTestWithLatestSpec() throws IOException, InterruptedException
         args.remove(args.size() - 1);
         args.add("run");
         output = TestUtils.executeCommand(args, projectPath);
-//        Assert.assertTrue(output.contains("Hello, World!"));
+        Assert.assertTrue(output.contains("Hello, World!"));
     }
 
     @Test(description = "Test dist list command.", dependsOnMethods = {"testUseCommand"})