diff options
Diffstat (limited to 'modules/aur/manifests/aura.pp')
-rw-r--r-- | modules/aur/manifests/aura.pp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/modules/aur/manifests/aura.pp b/modules/aur/manifests/aura.pp index 2dbcf39..1683cf8 100644 --- a/modules/aur/manifests/aura.pp +++ b/modules/aur/manifests/aura.pp | |||
@@ -6,12 +6,7 @@ class aur::aura( | |||
6 | ensure => "present" | 6 | ensure => "present" |
7 | } | 7 | } |
8 | 8 | ||
9 | exec { 'pacman-base-devel': | 9 | ensure_packages(['base-devel'], { 'install_options' => '--needed' }) |
10 | command => '/usr/bin/pacman -Sy base-devel --needed --noconfirm', | ||
11 | unless => '/usr/bin/pacman -Qo aura', | ||
12 | logoutput => 'on_failure', | ||
13 | } | ||
14 | |||
15 | ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' }) | 10 | ensure_packages(['gmp', 'pcre'], { 'install_options' => '--asdeps' }) |
16 | 11 | ||
17 | exec { 'aur::aura': | 12 | exec { 'aur::aura': |
@@ -20,14 +15,15 @@ class aur::aura( | |||
20 | command => 'curl -o /tmp/aur.sh aur.sh && chmod +x /tmp/aur.sh && /tmp/aur.sh aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && rm /tmp/aur.sh && rm -rf /tmp/aura-bin', | 15 | command => 'curl -o /tmp/aur.sh aur.sh && chmod +x /tmp/aur.sh && /tmp/aur.sh aura-bin && mv /tmp/aura-bin/aura-bin-*-x86_64.pkg.tar.xz /tmp/aura-bin-x86_64.pkg.tar.xz && rm /tmp/aur.sh && rm -rf /tmp/aura-bin', |
21 | user => "aur-builder", | 16 | user => "aur-builder", |
22 | unless => '/usr/bin/pacman -Qo aura', | 17 | unless => '/usr/bin/pacman -Qo aura', |
23 | require => Exec['pacman-base-devel'], | 18 | require => Package['base-devel'], |
24 | logoutput => 'on_failure', | 19 | logoutput => 'on_failure', |
25 | } | 20 | } |
26 | 21 | ||
27 | package { 'aura-bin': | 22 | package { 'aura-bin': |
28 | ensure => "present", | 23 | ensure => "present", |
29 | source => "/tmp/aura-bin-x86_64.pkg.tar.xz", | 24 | source => "/tmp/aura-bin-x86_64.pkg.tar.xz", |
30 | notify => Exec['aur::aura::cleanup'] | 25 | require => Exec['aur::aura'], |
26 | notify => Exec['aur::aura::cleanup'] | ||
31 | } | 27 | } |
32 | 28 | ||
33 | exec { 'aur::aura::cleanup': | 29 | exec { 'aur::aura::cleanup': |