From 6efdb22bc19f67ee9fd70e787099f13abb9a07ab Mon Sep 17 00:00:00 2001 From: Kevin Reeuwijk Date: Thu, 14 Dec 2017 18:01:42 +0100 Subject: [PATCH] PDK lint style updates --- examples/offline.pp | 2 +- examples/online.pp | 4 ++-- functions/compare_version.pp | 40 ++++++++++++++++++++---------------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/examples/offline.pp b/examples/offline.pp index 01e96aa..4e539b9 100644 --- a/examples/offline.pp +++ b/examples/offline.pp @@ -2,7 +2,7 @@ download_from_vmware => false, selfprovided_install_file => 'VMware-tools-10.1.7-5541682-x86_64.exe', selfprovided_install_version => '10.1.7.5541682', - selfprovided_file_source => 'puppet:///filerepo', + selfprovided_file_source => 'http://server/file', logfile_location => '%TEMP%\vmmsi.log', components_to_remove => 'Hgfs', } diff --git a/examples/online.pp b/examples/online.pp index 45d03d5..7989acd 100644 --- a/examples/online.pp +++ b/examples/online.pp @@ -1,6 +1,6 @@ class {'vmtools_win': - logfile_location => '%TEMP%\vmmsi.log', - components_to_remove => 'Hgfs', + logfile_location => '%TEMP%\vmmsi.log', + components_to_remove => 'Hgfs', } # 'minimum_version_level' determines up to which point you want to force upgrades when an existing version is found. diff --git a/functions/compare_version.pp b/functions/compare_version.pp index 09b5005..520e517 100644 --- a/functions/compare_version.pp +++ b/functions/compare_version.pp @@ -1,23 +1,27 @@ function vmtools_win::compare_version(String $givenversion, String $desiredversion) { - #This function compares two provided version numbers (dot-seperated) and returns the lowest level at which they differ and in which direction - #Example: + # This function compares two provided version numbers (dot-seperated) and returns + # the lowest level at which they differ and in which direction + # + # Example: # vmtools_win::compare_version('10.1.5.5051234', '10.1.7.5541682') # # returns: { 'lower' => 3 } - # This signifies that the 3rd level of the given version ('5') is lower than the desired version ('7'), with all previous levels being the same + # + # This signifies that the 3rd level of the given version ('5') is lower than the + # desired version ('7'), with all previous levels being the same #Split given version into levels of numbers - $arrGivenversion = split($givenversion, '[.]') - $arrDesiredversion = split($desiredversion, '[.]') + $arrgivenversion = split($givenversion, '[.]') + $arrdesiredversion = split($desiredversion, '[.]') #Determine size of arrays and use smallest size for comparison - $lenArrGiven = size($arrGivenversion) - $lenArrDesired = size($arrDesiredversion) + $lenarrgiven = size($arrgivenversion) + $lenarrdesired = size($arrdesiredversion) - $levelstocompare = min($lenArrGiven, $lenArrDesired) - 1 + $levelstocompare = min($lenarrgiven, $lenarrdesired) - 1 - $level = $arrGivenversion.reduce(0) |$memo, $value| { - if $arrGivenversion[$memo] == $arrDesiredversion[$memo] { + $level = $arrgivenversion.reduce(0) |$memo, $value| { + if $arrgivenversion[$memo] == $arrdesiredversion[$memo] { if $memo == $levelstocompare { $memo } @@ -30,19 +34,19 @@ function vmtools_win::compare_version(String $givenversion, String $desiredversi } } - if $arrGivenversion[$level] == $arrDesiredversion[$level] { - $direction = "Equal" + if $arrgivenversion[$level] == $arrdesiredversion[$level] { + $direction = 'Equal' } - elsif (0 + $arrGivenversion[$level]) > (0 + $arrDesiredversion[$level]) { - $direction = "Higher" + elsif (0 + $arrgivenversion[$level]) > (0 + $arrdesiredversion[$level]) { + $direction = 'Higher' } - elsif (0 + $arrGivenversion[$level]) < (0 + $arrDesiredversion[$level]) { - $direction = "Lower" + elsif (0 + $arrgivenversion[$level]) < (0 + $arrdesiredversion[$level]) { + $direction = 'Lower' } else { - $direction = "Error" + $direction = 'Error' } $hash = {$direction => $level + 1} - $hash + $hash }