Skip to content

Commit f73c920

Browse files
committed
Fixes install permissions for binaries
See #220
1 parent d8ccfe7 commit f73c920

File tree

8 files changed

+13
-18
lines changed

8 files changed

+13
-18
lines changed

internal/install/direct.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import "github.com/devops-works/binenv/internal/mapping"
44

55
// Direct installs directly downloaded binaries
66
type Direct struct {
7-
filter string
87
}
98

109
// Install will move the binary from src to dst

internal/install/gzip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (z GZip) Install(src, dst, version string, mapper mapping.Mapper) error {
2626
}
2727
defer in.Close()
2828

29-
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
29+
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
3030
if err != nil {
3131
return err
3232
}

internal/install/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func installFile(src, dst string) error {
6161
return err
6262
}
6363

64-
err = os.Chmod(dst, 0700)
64+
err = os.Chmod(dst, 0755)
6565
return err
6666

6767
}

internal/install/tarxz.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"archive/tar"
55
"bytes"
66
"io"
7-
"io/ioutil"
87
"log"
98
"os"
109

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

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

39-
for true {
38+
for {
4039
header, err := tarReader.Next()
4140
if err == io.EOF {
4241
break
@@ -56,7 +55,7 @@ func (x TarXZ) Install(src, dst, version string, mapper mapping.Mapper) error {
5655
continue
5756
}
5857

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

7170
return noMatches
72-
7371
}

internal/install/tbz.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"bytes"
66
"compress/bzip2"
77
"io"
8-
"io/ioutil"
98
"log"
109
"os"
1110

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

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

35-
for true {
34+
for {
3635
header, err := tarReader.Next()
3736
if err == io.EOF {
3837
break
@@ -52,7 +51,7 @@ func (x Tbz) Install(src, dst, version string, mapper mapping.Mapper) error {
5251
continue
5352
}
5453

55-
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
54+
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
5655
if err != nil {
5756
return err
5857
}

internal/install/tgz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (t Tgz) Install(src, dst, version string, mapper mapping.Mapper) error {
3434
tarReader := tar.NewReader(gzf)
3535
args := tpl.New(version, mapper)
3636

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

57-
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
57+
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
5858
if err != nil {
5959
return err
6060
}

internal/install/xz.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package install
33
import (
44
"bytes"
55
"io"
6-
"io/ioutil"
76
"log"
87
"os"
98

@@ -18,7 +17,7 @@ type XZ struct {
1817

1918
// Install file from xz file
2019
func (x XZ) Install(src, dst, version string, mapper mapping.Mapper) error {
21-
data, err := ioutil.ReadFile(src)
20+
data, err := os.ReadFile(src)
2221
if err != nil {
2322
log.Fatal(err)
2423
}
@@ -28,7 +27,7 @@ func (x XZ) Install(src, dst, version string, mapper mapping.Mapper) error {
2827
return err
2928
}
3029

31-
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
30+
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
3231
if err != nil {
3332
return err
3433
}

internal/install/zip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (z Zip) Install(src, dst, version string, mapper mapping.Mapper) error {
3535
continue
3636
}
3737

38-
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0750)
38+
out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
3939
if err != nil {
4040
return err
4141
}

0 commit comments

Comments
 (0)