diff options
| author | Eugen Wissner <belka@caraus.de> | 2021-06-30 09:06:17 +0200 |
|---|---|---|
| committer | Eugen Wissner <belka@caraus.de> | 2021-06-30 09:06:17 +0200 |
| commit | 9decbdd285834f80c7b4213d7b0316cd012168ed (patch) | |
| tree | 7067f09b15ced4ba92c0f40a8aa8792dcacc2902 | |
| parent | d1e98ff646d11381b83fa0f7abb9914b88f107d9 (diff) | |
| download | slackbuilder-9decbdd285834f80c7b4213d7b0316cd012168ed.tar.gz | |
Use Rakes fileutils for command execution
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | debug/PackageKit/PackageKit.rb | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -25,4 +25,6 @@ /config/config.rb /vendor/ /.bundle/ + /debug/PackageKit/PackageKit/ +/debug/PackageKit/package/ diff --git a/debug/PackageKit/PackageKit.rb b/debug/PackageKit/PackageKit.rb index efeb233..f093de7 100755 --- a/debug/PackageKit/PackageKit.rb +++ b/debug/PackageKit/PackageKit.rb @@ -9,8 +9,9 @@ # For the script to work PackageKit source should be in the ./PackageKit # directory alongside this script. -require 'fileutils' +require 'rake/file_utils' require 'pathname' +require 'rake' require 'open3' CWD = Pathname.new Dir.pwd @@ -28,7 +29,7 @@ version = `git -C #{SOURCE} describe --tags --abbrev=0` .delete_prefix('PACKAGEKIT_') .gsub('_', '.') -exec_result = system 'meson', +sh 'meson', '--buildtype=debug', '--prefix=/usr', '--libdir=/usr/lib64', @@ -43,10 +44,9 @@ exec_result = system 'meson', '-Ddaemon_tests=true', TMP.to_s, SOURCE.to_s -raise 'Meson build failed' unless exec_result -exec_result = system({'DESTDIR' => DESTINATION.to_s}, 'ninja', '-C', TMP.to_s, 'install') -raise 'Ninja installation failed' unless exec_result +sh({ 'DESTDIR' => DESTINATION.to_s }, + 'ninja', '-C', TMP.to_s, 'install') actual_mandir = DESTINATION + 'usr/share/man/man1' mandir = DESTINATION + 'usr/man/man1' |