Skip to content

feat(cli): check if dotfiles install script is executable #8588

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

Merged
merged 15 commits into from
Jul 21, 2023
+36 −0
Merged

feat(cli): check if dotfiles install script is executable #8588

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1d9c0f0
make dotfiles install scripts executable
BRAVO68WEB Jul 19, 2023
3cb96f9
refactor: added better error handling
BRAVO68WEB Jul 19, 2023
ca53d98
revert: prev installScriptSet
BRAVO68WEB Jul 19, 2023
27c4e25
Merge branch 'coder:main' into feat/dotfiles-exec
BRAVO68WEB Jul 19, 2023
ea1cb77
Update cli/dotfiles.go
BRAVO68WEB Jul 20, 2023
245ec38
docs: added docs regarding usage of setup script in dotfiles
BRAVO68WEB Jul 21, 2023
dfab224
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 2023
32a9218
Update cli/dotfiles.go
BRAVO68WEB Jul 21, 2023
5d9741d
Update cli/dotfiles.go
mafredri Jul 21, 2023
95510a2
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 2023
4900f44
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 2023
b460751
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 2023
ab300d5
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 2023
b2bbaa4
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 2023
b1a9a24
Update docs/dotfiles.md
BRAVO68WEB Jul 21, 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
Prev Previous commit
Next Next commit
refactor: added better error handling
  • Loading branch information
@BRAVO68WEB
BRAVO68WEB committed Jul 19, 2023
commit 3cb96f924819b3c6058b799fff83f57fa41b7a6d
21 changes: 13 additions & 8 deletions cli/dotfiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ func (r *RootCmd) dotfiles() *clibase.Cmd {
installScriptSet = []string{
"install.sh",
"install",
"bootstrap.sh",
"bootstrap",
// "bootstrap.sh",
// "bootstrap",
"script/bootstrap",
"setup.sh",
"setup",
Expand Down Expand Up @@ -193,16 +193,21 @@ func (r *RootCmd) dotfiles() *clibase.Cmd {
}

_, _ = fmt.Fprintf(inv.Stdout, "Running %s...\n", script)
// it is safe to use a variable command here because it's from
// a filtered list of pre-approved install scripts
// nolint:gosec

// making selected script executable
err = os.Chmod(filepath.Join(dotfilesDir, script), 0o755)
// Check if the script is executable and notify on error
scriptPath := filepath.Join(dotfilesDir, script)
fi, err := os.Stat(scriptPath)
if err != nil {
return xerrors.Errorf("chmod %s: %w", script, err)
return xerrors.Errorf("stat %s: %w", scriptPath, err)
}

if fi.Mode()&0o111 == 0 {
return xerrors.Errorf("%s script is not executable.\nTo solve this :-\n - Clone your dotfiles repo.\n - chmod +x %s\n - git add %s and git commit -m \"Make %s executable\"\n - git push\n", script, script, script, script)
}

// it is safe to use a variable command here because it's from
// a filtered list of pre-approved install scripts
// nolint:gosec
scriptCmd := exec.CommandContext(inv.Context(), filepath.Join(dotfilesDir, script))
scriptCmd.Dir = dotfilesDir
scriptCmd.Stdout = inv.Stdout
Expand Down