mirror/ nfpm
1
1
Fork 0
mirror of https://github.com/goreleaser/nfpm synced 2024-05-13 19:56:28 +02:00
Code Issues Releases Activity

fix: do not encourage using /usr/local/bin (#596) 

* fix: do not encourage using /usr/local/bin

Examples, tests and docs often refer to /usr/local/bin, which should
only be used for things compiled locally, which is not the case of
installed packages.

Changed that to /usr/bin, and also some usages of things like
/usr/something to /usr/share/something.

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>

* fix: complex test

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
This commit is contained in:
Carlos Alexandro Becker 2022-12-29 22:19:38 -03:00 committed by GitHub
parent 0c2ef6b723
commit dedee6d6b1
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 105 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apk/apk_test.go
View File

@ -65,7 +65,7 @@ func exampleInfo() *nfpm.Info {
Contents: []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/bin/fake",
},
{
Source: "../testdata/whatever.conf",
@ -110,7 +110,7 @@ func TestCreateBuilderData(t *testing.T) {
require.NoError(t, builderData(tw))
require.Equal(t, 13832, buf.Len())
require.Equal(t, 13320, buf.Len())
}
func TestCombineToApk(t *testing.T) {
@ -143,7 +143,7 @@ func TestPathsToCreate(t *testing.T) {
func TestDefaultWithArch(t *testing.T) {
expectedChecksums := map[string]string{
"usr/share/doc/fake/fake.txt": "96c335dc28122b5f09a4cef74b156cd24c23784c",
"usr/local/bin/fake": "f46cece3eeb7d9ed5cb244d902775427be71492d",
"usr/bin/fake": "f46cece3eeb7d9ed5cb244d902775427be71492d",
"etc/fake/fake.conf": "96c335dc28122b5f09a4cef74b156cd24c23784c",
"etc/fake/fake2.conf": "96c335dc28122b5f09a4cef74b156cd24c23784c",
}
@ -200,7 +200,7 @@ func TestFileDoesNotExist(t *testing.T) {
Contents: []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/bin/fake",
},
{
Source: "../testdata/whatever.confzzz",

2
arch/arch_test.go
View File

@ -42,7 +42,7 @@ func exampleInfo() *nfpm.Info {
Contents: []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/share/bin/fake",
},
{
Source: "../testdata/whatever.conf",

4
deb/deb_test.go
View File

@ -62,7 +62,7 @@ func exampleInfo() *nfpm.Info {
Contents: []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/bin/fake",
},
{
Source: "../testdata/whatever.conf",
@ -325,7 +325,7 @@ func TestDebFileDoesNotExist(t *testing.T) {
Contents: []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/bin/fake",
},
{
Source: "../testdata/whatever.confzzz",

6
internal/cmd/init.go
View File

@ -69,13 +69,13 @@ license: "MIT"
changelog: "changelog.yaml"
contents:
- src: ./foo
dst: /usr/local/bin/foo
dst: /usr/bin/foo
- src: ./bar
dst: /usr/local/bin/bar
dst: /usr/bin/bar
- src: ./foobar.conf
dst: /etc/foobar.conf
type: config
- src: /usr/local/bin/foo
- src: /usr/bin/foo
dst: /sbin/foo
type: symlink
overrides:

12
internal/rpmpack/rpm_test.go
View File

@ -22,7 +22,7 @@ func TestFileOwner(t *testing.T) {
user := "testUser"
r.AddFile(RPMFile{
Name: "/usr/local/hello",
Name: "/usr/hello",
Body: []byte("content of the file"),
Group: group,
Owner: user,
@ -46,7 +46,7 @@ func Test100644(t *testing.T) {
t.Fatalf("NewRPM returned error %v", err)
}
r.AddFile(RPMFile{
Name: "/usr/local/hello",
Name: "/usr/share/hello",
Body: []byte("content of the file"),
Mode: 0o100644,
})
@ -162,20 +162,20 @@ func TestAllowListDirs(t *testing.T) {
}
r.AddFile(RPMFile{
Name: "/usr/local/dir1",
Name: "/usr/share/dir1",
Mode: 0o40000,
})
r.AddFile(RPMFile{
Name: "/usr/local/dir2",
Name: "/usr/share/dir2",
Mode: 0o40000,
})
r.AllowListDirs(map[string]bool{"/usr/local/dir1": true})
r.AllowListDirs(map[string]bool{"/usr/share/dir1": true})
if err := r.Write(io.Discard); err != nil {
t.Errorf("NewRPM returned error %v", err)
}
expected := map[string]RPMFile{"/usr/local/dir1": {Name: "/usr/local/dir1", Mode: 0o40000}}
expected := map[string]RPMFile{"/usr/share/dir1": {Name: "/usr/share/dir1", Mode: 0o40000}}
if d := cmp.Diff(expected, r.files); d != "" {
t.Errorf("Expected dirs differs (want->got):\n%v", d)
}

4
rpm/rpm_test.go
View File

@ -54,7 +54,7 @@ func exampleInfo() *nfpm.Info {
Contents: []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/bin/fake",
},
{
Source: "../testdata/whatever.conf",
@ -466,7 +466,7 @@ func TestRPMFileDoesNotExist(t *testing.T) {
info.Contents = []*files.Content{
{
Source: "../testdata/fake",
Destination: "/usr/local/bin/fake",
Destination: "/usr/bin/fake",
},
{
Source: "../testdata/whatever.confzzz",

16
testdata/acceptance/apk.dockerfile vendored
View File

@ -16,12 +16,12 @@ RUN ls -l /path/to/symlink | grep "/path/to/symlink -> /etc/foo/whatever.conf"
# ---- simple test ----
FROM min AS simple
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN apk del foo
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- no-glob test ----
@ -36,7 +36,7 @@ RUN test -f /usr/share/whatever/folder2/file2
# ---- complex test ----
FROM min AS complex
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test -d /usr/share/whatever/
RUN test -d /usr/share/whatever/folder
@ -53,7 +53,7 @@ RUN test -f /etc/something/a
RUN test -f /etc/something/b
RUN test -d /etc/something/c
RUN test -f /etc/something/c/d
RUN test $(stat -c %a /usr/sbin/fake) -eq 4755
RUN test $(stat -c %a /usr/bin/fake2) -eq 4755
RUN test -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
RUN test ! -f /tmp/preremove-proof
@ -61,8 +61,8 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN apk del foo
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/sbin/fake
RUN test ! -f /usr/bin/fake
RUN test ! -f /usr/bin/fake2
RUN test -f /tmp/preremove-proof
RUN test -f /tmp/postremove-proof
RUN test ! -d /var/log/whatever
@ -79,7 +79,7 @@ RUN apk add /tmp/foo.apk
# ---- overrides test ----
FROM min AS overrides
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
@ -88,7 +88,7 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN apk del foo
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
RUN test -f /tmp/preremove-proof
RUN test ! -f /tmp/postremove-proof

16
testdata/acceptance/archlinux.dockerfile vendored
View File

@ -16,12 +16,12 @@ RUN ls -l /path/to/symlink | grep "/path/to/symlink -> /etc/foo/whatever.conf"
# ---- simple test ----
FROM min AS simple
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN pacman --noconfirm -R foo
RUN test -f /etc/foo/whatever.conf.pacsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- no-glob test ----
@ -39,7 +39,7 @@ FROM min AS complex
RUN pacman -Qi foo | grep "Depends On\\s*: bash"
RUN pacman -Qi foo | grep "Replaces\\s*: foo"
RUN pacman -Qi foo | grep "Provides\\s*: fake"
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test -d /usr/share/whatever/
RUN test -d /usr/share/whatever/folder
@ -56,7 +56,7 @@ RUN test -f /etc/something/a
RUN test -f /etc/something/b
RUN test -d /etc/something/c
RUN test -f /etc/something/c/d
RUN test $(stat -c %a /usr/bin/fake) -eq 4755
RUN test $(stat -c %a /usr/bin/fake2) -eq 4755
RUN test -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
RUN test ! -f /tmp/preremove-proof
@ -64,8 +64,8 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN pacman --noconfirm -R foo
RUN test -f /etc/foo/whatever.conf.pacsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
RUN test ! -f /usr/bin/fake2
RUN test -f /tmp/preremove-proof
RUN test -f /tmp/postremove-proof
RUN test ! -d /var/log/whatever
@ -80,7 +80,7 @@ RUN echo "Arch Linux has no signature support"
# ---- overrides test ----
FROM min AS overrides
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
@ -89,7 +89,7 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN pacman --noconfirm -R foo
RUN test -f /etc/foo/whatever.conf.pacsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
RUN test -f /tmp/preremove-proof
RUN test ! -f /tmp/postremove-proof
@ -133,4 +133,4 @@ RUN test -f /tmp/postupgrade-proof
RUN test -f /etc/regular.conf
RUN test -f /etc/regular.conf.pacnew
RUN test -f /etc/noreplace.conf
RUN test -f /etc/noreplace.conf.pacnew
RUN test -f /etc/noreplace.conf.pacnew

49
testdata/acceptance/core.complex.yaml vendored
View File

@ -21,7 +21,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/acceptance/folder/*
dst: /usr/share/whatever/folder
- src: ./testdata/whatever.conf
@ -29,32 +29,39 @@ contents:
type: config
- src: ./testdata/something
dst: /etc/something
- src: ./testdata/fake
dst: /usr/sbin/fake
packager: deb
file_info:
mode: 04755
- src: ./testdata/fake
dst: /usr/sbin/fake
packager: rpm
file_info:
mode: 04755
- src: ./testdata/fake
dst: /usr/sbin/fake
packager: apk
file_info:
mode: 04755
- src: ./testdata/fake
dst: /usr/bin/fake
file_info:
mode: 04755
packager: archlinux
- dst: /usr/foo/bar/something
type: dir
- dst: /var/log/whatever
type: dir
- dst: /usr/share/foo
type: dir
# Packager specifics:
- packager: deb
src: ./testdata/fake
dst: /usr/bin/fake2
file_info:
mode: 04755
- packager: rpm
src: ./testdata/fake
dst: /usr/bin/fake2
file_info:
mode: 04755
- packager: apk
src: ./testdata/fake
dst: /usr/bin/fake2
file_info:
mode: 04755
- packager: archlinux
src: ./testdata/fake
dst: /usr/bin/fake2
file_info:
mode: 04755
scripts:
preinstall: ./testdata/acceptance/scripts/preinstall.sh
postinstall: ./testdata/acceptance/scripts/postinstall.sh

2
testdata/acceptance/core.env-var-version.yaml vendored
View File

@ -19,7 +19,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/acceptance/folder/**/*
dst: /usr/share/whatever/folder/
- src: ./testdata/whatever.conf

2
testdata/acceptance/core.min.yaml vendored
View File

@ -5,4 +5,4 @@ license: MIT
maintainer: "Foo Bar"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake

2
testdata/acceptance/core.overrides.yaml vendored
View File

@ -19,7 +19,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/acceptance/folder/*
dst: /usr/share/whatever/folder
- src: ./testdata/whatever.conf

2
testdata/acceptance/core.signed.yaml vendored
View File

@ -8,7 +8,7 @@ vendor: "FooBarCorp"
homepage: "http://example.com"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
deb:
signature:
key_file: ./internal/sign/testdata/privkey_unprotected.asc

2
testdata/acceptance/core.simple.yaml vendored
View File

@ -12,7 +12,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/core.withchangelog.yaml vendored
View File

@ -13,7 +13,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/deb.debsign.sign.yaml vendored
View File

@ -8,7 +8,7 @@ vendor: "FooBarCorp"
homepage: "http://example.com"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
deb:
signature:
method: debsign

20
testdata/acceptance/deb.dockerfile vendored
View File

@ -16,12 +16,12 @@ RUN ls -l /path/to/symlink | grep "/path/to/symlink -> /etc/foo/whatever.conf"
# ---- simple test ----
FROM min AS simple
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN dpkg -r foo
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- no-glob test ----
@ -39,7 +39,7 @@ FROM min AS complex
RUN apt-cache show /tmp/foo.deb | grep "Depends: bash"
RUN apt-cache show /tmp/foo.deb | grep "Suggests: zsh"
RUN apt-cache show /tmp/foo.deb | grep "Recommends: fish"
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test -d /usr/share/whatever/
RUN test -d /usr/share/whatever/folder
@ -56,7 +56,7 @@ RUN test -f /etc/something/a
RUN test -f /etc/something/b
RUN test -d /etc/something/c
RUN test -f /etc/something/c/d
RUN test $(stat -c %a /usr/sbin/fake) -eq 4755
RUN test $(stat -c %a /usr/bin/fake2) -eq 4755
RUN test -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
RUN test ! -f /tmp/preremove-proof
@ -64,8 +64,8 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN dpkg -r foo
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/sbin/fake
RUN test ! -f /usr/bin/fake
RUN test ! -f /usr/bin/fake2
RUN test -f /tmp/preremove-proof
RUN test -f /tmp/postremove-proof
RUN test ! -d /var/log/whatever
@ -95,7 +95,7 @@ RUN dpkg -i /tmp/foo.deb
# ---- overrides test ----
FROM min AS overrides
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
@ -104,7 +104,7 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN dpkg -r foo
RUN test -f /etc/foo/whatever.conf
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
RUN test -f /tmp/preremove-proof
RUN test ! -f /tmp/postremove-proof
@ -161,11 +161,11 @@ RUN dpkg -i /tmp/foo.deb
# ---- compression test ----
FROM min AS compression
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN dpkg -r foo
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- upgrade test ----
FROM test_base AS upgrade

2
testdata/acceptance/deb.dpkg-sig.sign.yaml vendored
View File

@ -8,7 +8,7 @@ vendor: "FooBarCorp"
homepage: "http://example.com"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
deb:
signature:
method: dpkg-sig

2
testdata/acceptance/deb.gzip.compression.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/deb.none.compression.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/deb.rules.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/deb.triggers.yaml vendored
View File

@ -7,7 +7,7 @@ vendor: "foobar"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
scripts:
postinstall: ./testdata/acceptance/scripts/postinstall_trigger.sh
deb:

2
testdata/acceptance/deb.xz.compression.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

24
testdata/acceptance/rpm.dockerfile vendored
View File

@ -16,12 +16,12 @@ RUN ls -l /path/to/symlink | grep "/path/to/symlink -> /etc/foo/whatever.conf"
# ---- simple test ----
FROM min AS simple
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN rpm -e foo
RUN test -f /etc/foo/whatever.conf.rpmsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- no-glob test ----
@ -39,7 +39,7 @@ FROM min AS complex
RUN test "$(rpm -qp --recommends /tmp/foo.rpm)" = "fish"
RUN test "$(rpm -qp --suggests /tmp/foo.rpm)" = "zsh"
RUN test "$(rpm -qp --requires /tmp/foo.rpm)" = "bash"
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test -d /usr/share/whatever/folder
RUN test -f /usr/share/whatever/folder/file1
@ -55,7 +55,7 @@ RUN test -f /etc/something/a
RUN test -f /etc/something/b
RUN test -d /etc/something/c
RUN test -f /etc/something/c/d
RUN test $(stat -c %a /usr/sbin/fake) -eq 4755
RUN test $(stat -c %a /usr/bin/fake2) -eq 4755
RUN test -f /tmp/preinstall-proof
RUN test -f /tmp/postinstall-proof
RUN test -f /tmp/pretrans-proof
@ -65,8 +65,8 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN rpm -e foo
RUN test -f /etc/foo/whatever.conf.rpmsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/sbin/fake
RUN test ! -f /usr/bin/fake
RUN test ! -f /usr/bin/fake2
RUN test -f /tmp/preremove-proof
RUN test -f /tmp/postremove-proof
RUN test ! -d /var/log/whatever
@ -94,7 +94,7 @@ RUN yum install -y foo
# ---- overrides test ----
FROM min AS overrides
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN test -d /usr/share/whatever/folder
RUN test -f /usr/share/whatever/folder/file1
@ -109,7 +109,7 @@ RUN test ! -f /tmp/postremove-proof
RUN echo wat >> /etc/foo/whatever.conf
RUN rpm -e foo
RUN test -f /etc/foo/whatever.conf.rpmsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
RUN test ! -f /tmp/preremove-proof
RUN test -f /tmp/postremove-proof
@ -150,12 +150,12 @@ RUN rpm -q foo --changelog | grep -E "^- note 3$"
FROM min AS compression
ARG compression
RUN test "${compression}" = "$(rpm -qp --qf '%{PAYLOADCOMPRESSOR}' /tmp/foo.rpm)"
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN rpm -e foo
RUN test -f /etc/foo/whatever.conf.rpmsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- upgrade test ----
FROM test_base AS upgrade
@ -197,12 +197,12 @@ RUN cat /etc/noreplace.conf.rpmnew | grep foo=baz
# ---- release test ----
FROM min AS release
RUN test -e /usr/local/bin/fake
RUN test -e /usr/bin/fake
RUN test -f /etc/foo/whatever.conf
RUN echo wat >> /etc/foo/whatever.conf
RUN rpm -e foo
RUN test -f /etc/foo/whatever.conf.rpmsave
RUN test ! -f /usr/local/bin/fake
RUN test ! -f /usr/bin/fake
# ---- directories test ----
FROM test_base AS directories

2
testdata/acceptance/rpm.gzip.compression.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/rpm.lzma.compression.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/rpm.release.yaml vendored
View File

@ -12,7 +12,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

2
testdata/acceptance/rpm.xz.compression.yaml vendored
View File

@ -11,7 +11,7 @@ homepage: "https://foobar.org"
license: "MIT"
contents:
- src: ./testdata/fake
dst: /usr/local/bin/fake
dst: /usr/bin/fake
- src: ./testdata/whatever.conf
dst: /etc/foo/whatever.conf
type: config

8
www/docs/configuration.md
View File

@ -151,7 +151,7 @@ conflicts:
contents:
# Basic file that applies to all packagers
- src: path/to/local/foo
dst: /usr/local/bin/foo
dst: /usr/bin/foo
# Simple config file
- src: path/to/local/foo.conf
@ -164,8 +164,8 @@ contents:
- src: path/to/local/*.1.gz
dst: /usr/share/man/man1/
# Simple symlink at /usr/local/bin/foo which points to /sbin/foo, which is
# the same behaviour as `ln -s /sbin/foo /usr/local/bin/foo`.
# Simple symlink at /usr/bin/foo which points to /sbin/foo, which is
# the same behaviour as `ln -s /sbin/foo /usr/bin/foo`.
#
# This also means that both "src" and "dst" are paths inside the package (or
# rather paths in the file system where the package will be installed) and
@ -218,7 +218,7 @@ contents:
# than 'root') has to be always specified manually in 'file_info' as it will not be copied
# from the 'src' file.
- src: path/to/foo
dst: /usr/local/foo
dst: /usr/share/foo
file_info:
# Make sure that the mode is specified in octal, e.g. 0644 instead of 644.
mode: 0644