Merge pull request #312 from udda1996/bal-tool

Differentiate between 'bal dist update' and 'bal tool update'
ballerina-platform · Aug 29, 2023 · 1bbe929 · 1bbe929
2 parents 9a153ee + baf9a19
commit 1bbe929
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,8 +6,8 @@ jreVersion=17.0.7+7
 # For test purpose
 swan-lake-version=2201.2.0
 swan-lake-spec-version=2022R3
-swan-lake-latest-version=2201.7.0
+swan-lake-latest-version=2201.7.1
 swan-lake-latest-spec-version=2023R1
 1-x-channel-version=1.2.0
 1-x-channel-spec-version=2020R1
-1-x-channel-latest-version=1.2.40
+1-x-channel-latest-version=1.2.43
diff --git a/resources/bin/bal b/resources/bin/bal
@@ -66,7 +66,7 @@
   RUN_COMMAND=false
   RUN_BALLERINA=true
 
-  if [ "$1" == "dist" ] || [ "$2" == "dist" ] || [ "$1" == "update" ]|| [ "$2" == "update" ]
+  if [ "$1" == "dist" ] || [ "$2" == "dist" ] || [ "$1" == "update" ] || ( [ "$1" == "dist" ] && [ "$2" == "update" ] )
   then
       RUN_COMMAND=true
       RUN_BALLERINA=false

diff --git a/resources/bin/bal.bat b/resources/bin/bal.bat
@@ -29,7 +29,11 @@ set JAVA_CMD=java
 if "%1" == "dist" set dist=true
 if "%~2" == "dist" set dist=true
 if "%1" == "update" set dist=true
-if "%~2" == "update" set dist=true
+if "%~2" == "update" (
+    if "%1" == "dist" (
+        set dist=true
+    )
+)
 if "%1" == "build" set dist=true
 if "%1" == "update" set update=true
 if "%1" == "build" set build=true