From 955a2390c00731be4d61eaff2ea05bfee08118d0 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 9 Oct 2018 00:00:20 -0400 Subject: refactor --- modules/package/manifests/makepkg.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/package') diff --git a/modules/package/manifests/makepkg.pp b/modules/package/manifests/makepkg.pp index 2373abf..7692b17 100644 --- a/modules/package/manifests/makepkg.pp +++ b/modules/package/manifests/makepkg.pp @@ -1,4 +1,4 @@ -define package::makepkg($ensure, $asdeps=false) { +define package::makepkg($ensure, $build_user, $asdeps=false) { if $asdeps { $extra_cmdline = " --asdeps" } @@ -13,15 +13,15 @@ define package::makepkg($ensure, $asdeps=false) { command => " cd /tmp rm -rf 'makepkg-$name' - su doy -c 'git clone https://aur.archlinux.org/$name.git makepkg-$name' + su $build_user -c 'git clone https://aur.archlinux.org/$name.git makepkg-$name' cd 'makepkg-$name' - su doy -c makepkg + su $build_user -c makepkg pacman -U --noconfirm --needed $extra_cmdline $name-*.pkg.tar.xz ", unless => "pacman -Q $name > /dev/null 2>&1", path => "/usr/bin", require => [ - Tozt::User["doy"], + Tozt::User[$build_user], Package["git"], Package["pkgconf"], ]; -- cgit v1.2.3-54-g00ecf