Move packages install into seperate command

This commit is contained in:
Jake Howard 2017-10-08 17:34:31 +01:00
parent 6a882b79db
commit fd8be599cf
Signed by: jake
GPG key ID: 57AFB45680EDD477
4 changed files with 7 additions and 16 deletions

View file

@ -2,8 +2,8 @@
set -e set -e
patch /usr/bin/makepkg < makepkg.patch
puppet apply manifests/main.pp --modulepath=modules/ --verbose 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 patch /usr/bin/makepkg -R < makepkg.patch

View file

@ -1,4 +1,4 @@
class yaourt::packages () { node default {
package {[ package {[
'acpi', 'acpi',
'advanced-ssh-config', 'advanced-ssh-config',
@ -22,10 +22,6 @@ class yaourt::packages () {
'freac', 'freac',
'gimp', 'gimp',
'glogg', 'glogg',
'gnome-shell-extension-drop-down-terminal-git',
'gnome-shell-extension-laine-git',
'gnome-shell-extension-put-window-git',
'gnome-shell-extension-topicons-plus',
'gnome-shell-mousewheel-zoom', 'gnome-shell-mousewheel-zoom',
'google-earth', 'google-earth',
'gparted', 'gparted',
@ -70,12 +66,12 @@ class yaourt::packages () {
'slack-desktop', 'slack-desktop',
'spotify', 'spotify',
'steam', 'steam',
'sublime-text-dev',
'sysstat', 'sysstat',
'terminator', 'terminator',
'thefuck', 'thefuck',
'thunderbird', 'thunderbird',
'tig', 'tig',
'tor-browser-en',
'ttf-emojione-color', 'ttf-emojione-color',
'ttf-google-fonts-git', 'ttf-google-fonts-git',
'ttf-ms-fonts', 'ttf-ms-fonts',
@ -86,8 +82,6 @@ class yaourt::packages () {
'vim', 'vim',
'virtualbox', 'virtualbox',
'vivaldi', 'vivaldi',
'vivaldi-ffmpeg-codecs',
'vivaldi-widevine',
'vlc', 'vlc',
'vundle', 'vundle',
'wps-office', 'wps-office',
@ -100,6 +94,6 @@ class yaourt::packages () {
'zsh-completions', 'zsh-completions',
'zsh-doc' 'zsh-doc'
]: ]:
ensure => latest ensure => installed
} }
} }

View file

@ -17,7 +17,6 @@ class config::vim {
exec { 'install vim plugins': exec { 'install vim plugins':
command => "vim +PluginInstall +qall", command => "vim +PluginInstall +qall",
user => "jake", user => "jake",
environment => "HOME=/home/jake", environment => "HOME=/home/jake"
require => Package['vim']
} }
} }

View file

@ -1,7 +1,5 @@
class yaourt { class yaourt {
include 'yaourt::files' include 'yaourt::files'
# include 'yaourt::keys' include 'yaourt::keys'
include 'yaourt::packages'
} }