Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Quote in username errors dapr init #972 #1322

Merged
merged 9 commits into from
Jun 26, 2023
Merged

Fix for Quote in username errors dapr init #972 #1322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9fc57e
Fix for Quote in username errors dapr init #972
Jun 22, 2023
648b1ec
addressed a GitHub Actions Check failure
Jun 22, 2023
69f5b56
Addressed Shubham's comments
mohitpalsingh Jun 23, 2023
29b9c8d
Addressed Shubham's new comments
mohitpalsingh Jun 23, 2023
f506e96
Addressed a GitHub actions failure
mohitpalsingh Jun 23, 2023
d58b9e5
Update utils/utils.go
mohitpalsingh Jun 23, 2023
b29f32e
Added Unit test for SanitizeDir() in utils/utils_test.go
mohitpalsingh Jun 23, 2023
d47c682
Addressed a GitHub actions failure
mohitpalsingh Jun 24, 2023
0c45ce1
Update comment.
shubham1172 Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/standalone/standalone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@ func moveFileToPath(filepath string, installLocation string) (string, error) {
p := os.Getenv("PATH")

if !strings.Contains(strings.ToLower(p), strings.ToLower(destDir)) {
utils.FixCommandWithApostrophe(&destDir)
pathCmd := "[System.Environment]::SetEnvironmentVariable('Path',[System.Environment]::GetEnvironmentVariable('Path','user') + '" + fmt.Sprintf(";%s", destDir) + "', 'user')"
_, err := utils.RunCmdAndWait("powershell", pathCmd)
if err != nil {
Expand Down
15 changes: 15 additions & 0 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,3 +403,18 @@
}
return filePath, nil
}

// FixCommandWithApostrophe corrects the passed command which might have apostrophes in it

Check failure on line 407 in utils/utils.go

View workflow job for this annotation

GitHub Actions / Build linux_amd64 binaries 

Comment should end in a period (godot)
func FixCommandWithApostrophe(destDir *string) {
mohitpalsingh marked this conversation as resolved.
Show resolved Hide resolved
bytes := []byte(*destDir)
var result []byte

for i := 0; i < len(bytes); i++ {
result = append(result, bytes[i])
if bytes[i] == '\'' {
result = append(result, '\'')
}
}

*destDir = string(result)
}
Loading