diff --git a/pkg.info b/pkg.info index cb66366..c2d4a3e 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: fish description: A smart and user-friendly command line shell -version: 4.1.0 +version: 4.1.1 revision: 1 url: https://fishshell.com/ license: GPL2,PSF2,MIT,LGPL2 @@ -23,4 +23,4 @@ downloads: - url: https://github.com/fish-shell/fish-shell/releases/download/${BPM_PKG_VERSION}/fish-${BPM_PKG_VERSION}.tar.xz extract_to_bpm_source: true extract_strip_components: 1 - checksum: 07a76c67e161b9edc772e6f1d66ebead85d7056e86631d61577f9f9a529c4d9c + checksum: aaf567cac98aa92fed9db3280801e2de45306169c8915e0fff1a61c07e56d2c1 diff --git a/source.sh b/source.sh index b589068..7f41159 100644 --- a/source.sh +++ b/source.sh @@ -5,25 +5,21 @@ # The build function is executed in the source directory # This function is used to compile the source code build() { - mkdir build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=Release -Wno-dev .. - make VERBOSE=1 + cmake -B build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=Release -Wno-dev + cmake --build build } # The check function is executed in the source directory # This function is used to run tests to verify the package has been compiled correctly check() { - cd build - make fish_run_tests + make test } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { - cd build - make DESTDIR="$BPM_OUTPUT" install - - install -Dm 644 ../doc_src/license.rst "$BPM_OUTPUT"/usr/share/licenses/fish/license.rst + DESTDIR="$BPM_OUTPUT" cmake --install build + + # Install package license + install -Dm 644 "$BPM_SOURCE"/doc_src/license.rst "$BPM_OUTPUT"/usr/share/licenses/fish/license.rst }