Skip to content

Commit 777536c

Browse files
authored
Write maintainer scripts with mode 0755 to stop lintian from complaining. (#34)
1 parent c38335c commit 777536c

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

control.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (deb *DebPkg) AddControlExtraString(name, s string) error {
212212
deb.control.hasCustomConffiles = true
213213
}
214214
s = strings.Replace(s, "\r\n", "\n", -1)
215-
return deb.control.tgz.AddFileFromBuffer(name, []byte(s))
215+
return deb.control.tgz.AddFileFromBuffer(name, []byte(s), 0755)
216216
}
217217

218218
// AddControlExtra allows the advanced user to add custom script to the control.tar.gz Typical usage is
@@ -250,15 +250,15 @@ func (c *control) markConfigFile(dest string) error {
250250
// config-files
251251
func (c *control) finalizeControlFile(d *data) error {
252252
if !c.hasCustomConffiles {
253-
if err := c.tgz.AddFileFromBuffer("conffiles", []byte(c.conffiles)); err != nil {
253+
if err := c.tgz.AddFileFromBuffer("conffiles", []byte(c.conffiles), 0); err != nil {
254254
return err
255255
}
256256
}
257257
controlFile := []byte(c.String(d.tgz.Written()))
258-
if err := c.tgz.AddFileFromBuffer("control", controlFile); err != nil {
258+
if err := c.tgz.AddFileFromBuffer("control", controlFile, 0); err != nil {
259259
return err
260260
}
261-
if err := c.tgz.AddFileFromBuffer("md5sums", []byte(d.md5sums)); err != nil {
261+
if err := c.tgz.AddFileFromBuffer("md5sums", []byte(d.md5sums), 0); err != nil {
262262
return err
263263
}
264264
return nil

data.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (d *data) addToMD5sums(md5 []byte, dest string) {
7070
func (d *data) addFileString(contents, dest string) error {
7171
d.addParentDirectories(dest)
7272

73-
if err := d.tgz.AddFileFromBuffer(dest, []byte(contents)); err != nil {
73+
if err := d.tgz.AddFileFromBuffer(dest, []byte(contents), 0); err != nil {
7474
return err
7575
}
7676

internal/targzip/targz.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,16 @@ func (t *TarGzip) AddFile(filename string, dest ...string) error {
9898
return nil
9999
}
100100

101-
// AddFileFromBuffer adds a file from a buffer
102-
func (t *TarGzip) AddFileFromBuffer(filename string, b []byte) error {
101+
// AddFileFromBuffer adds a file from a buffer. The mode is optional and defaults to 0644.
102+
func (t *TarGzip) AddFileFromBuffer(filename string, b []byte, mode int64) error {
103+
if mode == 0 {
104+
mode = 0644
105+
}
106+
103107
hdr := tar.Header{
104108
Name: strings.Trim(filename, "/"),
105109
Size: int64(len(b)),
106-
Mode: 0644,
110+
Mode: mode,
107111
Uid: 0,
108112
Gid: 0,
109113
ModTime: time.Now(),

0 commit comments

Comments
 (0)