Skip to content
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

Removing .sh for defaults, init and profile files #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing .sh for defaults, init and profile files #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions debian/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ func (d *Package) Normalize(debianDir string, version string, arch string) {
}

if d.InitFile != "" && contains(d.Conffiles, d.InitFile) == false {
d.Conffiles = append(d.Conffiles, filepath.Join("etc", "init.d", d.Name+".sh"))
d.Conffiles = append(d.Conffiles, filepath.Join("etc", "init.d", d.Name))
}
if d.DefaultFile != "" && contains(d.Conffiles, d.DefaultFile) == false {
d.Conffiles = append(d.Conffiles, filepath.Join("etc", "default", d.Name+".sh"))
d.Conffiles = append(d.Conffiles, filepath.Join("etc", "default", d.Name))
}

if len(d.Envs) > 0 {
d.Conffiles = append(d.Conffiles, filepath.Join("etc", "profile.d", d.Name+".sh"))
d.Conffiles = append(d.Conffiles, filepath.Join("etc", "profile.d", d.Name))
}
}

Expand Down Expand Up @@ -447,7 +447,7 @@ func (d *Package) WriteEnvProfile(debianDir string) error {
if content == "" {
return nil
}
f := filepath.Join(debianDir, "etc", "profile.d", d.Name+".sh")
f := filepath.Join(debianDir, "etc", "profile.d", d.Name)
if err := os.MkdirAll(filepath.Dir(f), 0755); err != nil {
return err
}
Expand Down Expand Up @@ -838,7 +838,7 @@ func (d *Package) WriteUnitFile(dataDir string) error {
// WriteInitFile writes the etc/init.d file.
func (d *Package) WriteInitFile(dataDir string) error {
if d.InitFile != "" {
f := filepath.Join(dataDir, "etc", "init.d", d.Name+".sh")
f := filepath.Join(dataDir, "etc", "init.d", d.Name)
if err := os.MkdirAll(filepath.Dir(f), 0755); err != nil {
return err
}
Expand All @@ -853,7 +853,7 @@ func (d *Package) WriteInitFile(dataDir string) error {
// WriteDefaultInitFile writes the etc/default file.
func (d *Package) WriteDefaultInitFile(dataDir string) error {
if d.DefaultFile != "" {
f := filepath.Join(dataDir, "etc", "default", d.Name+".sh")
f := filepath.Join(dataDir, "etc", "default", d.Name)
if err := os.MkdirAll(filepath.Dir(f), 0755); err != nil {
return err
}
Expand Down