Merge it back in, so it runs in 1 time

2017-10-08 17:42:04 +01:00 · 2017-10-08 17:42:04 +01:00 · 64ca88daa0
commit 64ca88daa0
parent fd8be599cf
3 changed files with 5 additions and 3 deletions
--- a/deploy.sh
+++ b/deploy.sh
@ -2,8 +2,8 @@

 set -e

+patch /usr/bin/makepkg < makepkg.patch
+
 puppet apply manifests/main.pp --modulepath=modules/ --verbose

-patch /usr/bin/makepkg < makepkg.patch
-puppet apply manifests/packages.pp --modulepath=modules/ --verbose
 patch /usr/bin/makepkg -R < makepkg.patch
--- a/modules/yaourt/manifests/init.pp
+++ b/modules/yaourt/manifests/init.pp
@ -1,5 +1,7 @@
 class yaourt {
  include 'yaourt::files'

+  include 'yaourt::packages';
+
  include 'yaourt::keys'
 }
--- a/modules/yaourt/manifests/packages.pp
+++ b/modules/yaourt/manifests/packages.pp
@ -1,4 +1,4 @@
-node default {
+class yaourt::packages () {
  package {[
    'acpi',
    'advanced-ssh-config',