Skip to content

Commit

Permalink
Fixes install permissions for binaries
Browse files Browse the repository at this point in the history
See #220
  • Loading branch information
leucos committed Feb 18, 2023
1 parent d8ccfe7 commit f73c920
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 18 deletions.
1 change: 0 additions & 1 deletion internal/install/direct.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import "github.com/devops-works/binenv/internal/mapping"

// Direct installs directly downloaded binaries
type Direct struct {
filter string
}

// Install will move the binary from src to dst
Expand Down
2 changes: 1 addition & 1 deletion internal/install/gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (z GZip) Install(src, dst, version string, mapper mapping.Mapper) error {
}
defer in.Close()

out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func installFile(src, dst string) error {
return err
}

err = os.Chmod(dst, 0700)
err = os.Chmod(dst, 0755)
return err

}
8 changes: 3 additions & 5 deletions internal/install/tarxz.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"archive/tar"
"bytes"
"io"
"io/ioutil"
"log"
"os"

Expand All @@ -23,7 +22,7 @@ type TarXZ struct {
func (x TarXZ) Install(src, dst, version string, mapper mapping.Mapper) error {
noMatches := ErrNoMatch

data, err := ioutil.ReadFile(src)
data, err := os.ReadFile(src)
if err != nil {
log.Fatal(err)
}
Expand All @@ -36,7 +35,7 @@ func (x TarXZ) Install(src, dst, version string, mapper mapping.Mapper) error {
tarReader := tar.NewReader(r)
args := tpl.New(version, mapper)

for true {
for {
header, err := tarReader.Next()
if err == io.EOF {
break
Expand All @@ -56,7 +55,7 @@ func (x TarXZ) Install(src, dst, version string, mapper mapping.Mapper) error {
continue
}

out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
if err != nil {
return err
}
Expand All @@ -69,5 +68,4 @@ func (x TarXZ) Install(src, dst, version string, mapper mapping.Mapper) error {
}

return noMatches

}
7 changes: 3 additions & 4 deletions internal/install/tbz.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"bytes"
"compress/bzip2"
"io"
"io/ioutil"
"log"
"os"

Expand All @@ -22,7 +21,7 @@ type Tbz struct {
func (x Tbz) Install(src, dst, version string, mapper mapping.Mapper) error {
noMatches := ErrNoMatch

data, err := ioutil.ReadFile(src)
data, err := os.ReadFile(src)
if err != nil {
log.Fatal(err)
}
Expand All @@ -32,7 +31,7 @@ func (x Tbz) Install(src, dst, version string, mapper mapping.Mapper) error {
tarReader := tar.NewReader(r)
args := tpl.New(version, mapper)

for true {
for {
header, err := tarReader.Next()
if err == io.EOF {
break
Expand All @@ -52,7 +51,7 @@ func (x Tbz) Install(src, dst, version string, mapper mapping.Mapper) error {
continue
}

out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/install/tgz.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (t Tgz) Install(src, dst, version string, mapper mapping.Mapper) error {
tarReader := tar.NewReader(gzf)
args := tpl.New(version, mapper)

for true {
for {
header, err := tarReader.Next()
if err == io.EOF {
break
Expand All @@ -54,7 +54,7 @@ func (t Tgz) Install(src, dst, version string, mapper mapping.Mapper) error {
continue
}

out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
if err != nil {
return err
}
Expand Down
5 changes: 2 additions & 3 deletions internal/install/xz.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package install
import (
"bytes"
"io"
"io/ioutil"
"log"
"os"

Expand All @@ -18,7 +17,7 @@ type XZ struct {

// Install file from xz file
func (x XZ) Install(src, dst, version string, mapper mapping.Mapper) error {
data, err := ioutil.ReadFile(src)
data, err := os.ReadFile(src)
if err != nil {
log.Fatal(err)
}
Expand All @@ -28,7 +27,7 @@ func (x XZ) Install(src, dst, version string, mapper mapping.Mapper) error {
return err
}

out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/install/zip.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (z Zip) Install(src, dst, version string, mapper mapping.Mapper) error {
continue
}

out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
if err != nil {
return err
}
Expand Down

0 comments on commit f73c920

Please sign in to comment.