From 4a880ad141c8deefb41549e5e79c868303e1c296 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 23 Sep 2016 16:29:26 -0300 Subject: Coding style for utilities --- manifests/utils/multimedia/cdplayer.pp | 6 +++++- manifests/utils/multimedia/downloaders.pp | 4 +++- manifests/utils/multimedia/extractors.pp | 6 +++++- manifests/utils/multimedia/gnash.pp | 8 ++++++-- manifests/utils/multimedia/mediacenter.pp | 7 ++++++- manifests/utils/multimedia/minimal.pp | 10 ++++++++-- manifests/utils/multimedia/ripper.pp | 12 +++++++++++- manifests/utils/multimedia/scanner.pp | 4 +++- manifests/utils/multimedia/shockwave.pp | 4 +++- manifests/utils/multimedia/studio.pp | 20 +++++++++++++++++--- 10 files changed, 67 insertions(+), 14 deletions(-) (limited to 'manifests/utils/multimedia') diff --git a/manifests/utils/multimedia/cdplayer.pp b/manifests/utils/multimedia/cdplayer.pp index b006441..05e88ad 100644 --- a/manifests/utils/multimedia/cdplayer.pp +++ b/manifests/utils/multimedia/cdplayer.pp @@ -1,6 +1,10 @@ class nodo::utils::multimedia::cdplayer { # CD writers and extractors - package { [ 'mcdp', 'cdtool', 'cd-discid' ]: + package { [ + 'mcdp', + 'cdtool', + 'cd-discid', + ]: ensure => installed, } } diff --git a/manifests/utils/multimedia/downloaders.pp b/manifests/utils/multimedia/downloaders.pp index 26e761c..40d610f 100644 --- a/manifests/utils/multimedia/downloaders.pp +++ b/manifests/utils/multimedia/downloaders.pp @@ -1,6 +1,8 @@ class nodo::utils::multimedia::downloaders { # Jessie onwards - package { 'youtube-dl': + package { [ + 'youtube-dl', + ]: ensure => $::lsbdistcodename ? { 'wheezy' => absent, default => present, diff --git a/manifests/utils/multimedia/extractors.pp b/manifests/utils/multimedia/extractors.pp index 19d3332..a3fde3c 100644 --- a/manifests/utils/multimedia/extractors.pp +++ b/manifests/utils/multimedia/extractors.pp @@ -1,5 +1,9 @@ class nodo::utils::multimedia::extractors { - package { [ 'rar', 'unrar', 'zip' ]: + package { [ + 'rar', + 'unrar', + 'zip', + ]: ensure => present, } } diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp index 3cd564f..5283534 100644 --- a/manifests/utils/multimedia/gnash.pp +++ b/manifests/utils/multimedia/gnash.pp @@ -1,9 +1,13 @@ class nodo::utils::multimedia::gnash { - package { 'flashplugin-nonfree': + package { [ + 'flashplugin-nonfree', + ]: ensure => purged, } - package { 'browser-plugin-gnash': + package { [ + 'browser-plugin-gnash', + ]: ensure => present, } diff --git a/manifests/utils/multimedia/mediacenter.pp b/manifests/utils/multimedia/mediacenter.pp index 362e4f3..d3388b2 100644 --- a/manifests/utils/multimedia/mediacenter.pp +++ b/manifests/utils/multimedia/mediacenter.pp @@ -1,5 +1,10 @@ class nodo::utils::multimedia::mediacenter { - package { [ 'xbmc', 'upnp-inspector', 'gupnp-tools', 'djmount' ]: + package { [ + 'xbmc', + 'upnp-inspector', + 'gupnp-tools', + 'djmount', + ]: ensure => present, } } diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp index 04709ed..d779524 100644 --- a/manifests/utils/multimedia/minimal.pp +++ b/manifests/utils/multimedia/minimal.pp @@ -1,9 +1,15 @@ class nodo::utils::multimedia::minimal { - package { [ 'alsa-utils', 'mpg123', 'mediainfo' ]: + package { [ + 'alsa-utils', + 'mpg123', + 'mediainfo', + ]: ensure => installed, } - package { 'mplayer': + package { [ + 'mplayer', + ]: ensure => present, name => $::lsbdistcodename ? { 'wheezy' => 'mplayer', diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp index 9fcd12f..c97908d 100644 --- a/manifests/utils/multimedia/ripper.pp +++ b/manifests/utils/multimedia/ripper.pp @@ -1,6 +1,16 @@ class nodo::utils::multimedia::ripper { # CD writers and extractors - package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools', 'cdrskin', 'cd5', 'eject', 'cdrdao' ]: + package { [ + 'ripit', + 'asunder', + 'wodim', + 'genisoimage', + 'dvd+rw-tools', + 'cdrskin', + 'cd5', + 'eject', + 'cdrdao', + ]: ensure => installed, } } diff --git a/manifests/utils/multimedia/scanner.pp b/manifests/utils/multimedia/scanner.pp index 5b5302a..abe8b64 100644 --- a/manifests/utils/multimedia/scanner.pp +++ b/manifests/utils/multimedia/scanner.pp @@ -1,5 +1,7 @@ class nodo::utils::multimedia::scanner { - package { 'xsane': + package { [ + 'xsane', + ]: ensure => present, } } diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp index a0d644d..cf3a712 100644 --- a/manifests/utils/multimedia/shockwave.pp +++ b/manifests/utils/multimedia/shockwave.pp @@ -1,6 +1,8 @@ class nodo::utils::multimedia::shockwave { # See also https://github.com/i-rinat/freshplayerplugin - package { 'flashplugin-nonfree': + package { [ + 'flashplugin-nonfree', + ]: ensure => installed , } diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp index 8aadf22..742cf9c 100644 --- a/manifests/utils/multimedia/studio.pp +++ b/manifests/utils/multimedia/studio.pp @@ -1,15 +1,29 @@ class nodo::utils::multimedia::studio { - package { [ 'ardour', 'hydrogen', 'mixxx' ]: + package { [ + 'ardour', + 'hydrogen', + 'mixxx', + ]: ensure => installed, } # Instruments - package { [ 'amsynth', 'guitarix', 'rakarrack', 'tuxguitar-jack' ]: + package { [ + 'amsynth', + 'guitarix', + 'rakarrack', + 'tuxguitar-jack', + ]: ensure => installed, } # LADSPA plugins - package { [ 'fil-plugins', 'swh-plugins', 'tap-plugins', 'invada-studio-plugins-ladspa' ]: + package { [ + 'fil-plugins', + 'swh-plugins', + 'tap-plugins', + 'invada-studio-plugins-ladspa', + ]: ensure => installed, } } -- cgit v1.2.3