Merge remote-tracking branch 'upstream/main'

Author: cjlapao

CHANGELOG.md

@@ -3,25 +3,6 @@
 All notable changes to this project will be documented in this file.
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.6.13766604452] - 2025-03-10
-
-
-
-## [0.6.13289211368] - 2025-02-12
-
-- Fixed some small bugs that would make the deploy fail when updating the pd devops in some scenarios where tools where missing
-- fixes # (issue)
-
-## [0.6.13282186908] - 2025-02-12
-
-
-
-## [0.6.12926508568] - 2025-01-23
-
-- Updated the discord announcement script
-- Added a script to get the beta changelog
-- Updated the way we generate release notes to match the type of release
-
 ## [0.5.13] - 2025-01-22
 
 - Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

internal/deploy/devops_service.go

@@ -139,12 +139,21 @@ func (c *DevOpsServiceClient) InstallDependencies(ctx context.Context, listToIns
 				if err != nil {
 					return installed_dependencies, errors.New("Error setting up sudo access for brew without password, error: " + err.Error())
 				}
-				// adding access to /usr/local/share to the local user for brew
-				cmd = "sudo"
-				arguments := []string{"chown", "-R", "$(whoami):$(id -g)", "/usr/local/share"}
+
+				// adding access to /usr/local/share to the local user for brew if the folder exist, this is due to an issue with the permissions
+				// on some mac intel machines
+				// first we will check if the folder exists
+				cmd = "ls"
+				arguments := []string{"/usr/local/share"}
 				_, err = c.client.RunCommand(cmd, arguments)
-				if err != nil {
-					return installed_dependencies, errors.New("Error setting up brew access to /usr/local/share, error: " + err.Error())
+				if err == nil {
+					// if the folder does exist we will set the permissions
+					cmd = "sudo"
+					arguments := []string{"chown", "-R", "$(whoami):$(id -g)", "/usr/local/share"}
+					_, err = c.client.RunCommand(cmd, arguments)
+					if err != nil {
+						return installed_dependencies, errors.New("Error setting up brew access to /usr/local/share, error: " + err.Error())
+					}
 				}
 
 			case "git":
@@ -539,7 +548,7 @@ func (c *DevOpsServiceClient) InstallDevOpsService(ctx context.Context, license
 
 	devopsPath = c.findPath(ctx, "prldevops")
 	if devopsPath == "" {
-		return "", errors.New("Error running devops install command, error: brew not found")
+		return "", errors.New("Error running devops install command, error: prldevops exec was not found")
 	}
 
 	folderPath := c.findPathFolder(ctx, "prldevops")