Skip to content

Commit

Permalink
PDK lint style updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Reeuwijk committed Dec 14, 2017
1 parent 0c5c647 commit 6efdb22
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion examples/offline.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
Expand Down
4 changes: 2 additions & 2 deletions examples/online.pp
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
40 changes: 22 additions & 18 deletions functions/compare_version.pp
Original file line number Diff line number Diff line change
@@ -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
}
Expand All @@ -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
}

0 comments on commit 6efdb22

Please sign in to comment.