Merge pull request #67 from jaypipes/issue66

Only attempt chmod of `aws` CLI if not executable
aws · Dec 30, 2019 · a10e56f · a10e56f
2 parents b661606 + c640b28
commit a10e56f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"syscall"
 	"time"
 )
 
@@ -79,6 +80,10 @@ func EnsureExecutable(p string) error {
 	if err != nil {
 		return fmt.Errorf("error doing stat on %q: %v", p, err)
 	}
+	m := s.Mode()
+	if m&(syscall.S_IXOTH|syscall.S_IXGRP|syscall.S_IXUSR) != 0 {
+		return nil
+	}
 	if err := os.Chmod(p, s.Mode()|0111); err != nil {
 		return fmt.Errorf("error doing chmod on %q: %v", p, err)
 	}