Fixes MSI Parameters Port and InstallDir #287
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
InstallDir was being taken, processed, restored (in some cases) but never actually used. JenkinsDir was the property that was actually being used. This was confusing, so this commit changes the flow of the InstallDir input to end up in the JenkinsDir property.
The PORT property was able to be passed in, held in a separate variable ready to overwrite registry-searched values, and... was completely ignored in favour of the PORTNUMBER property. This commit changes the flow of this variable such that it now ends up overwriting PORTNUMBER instead of PORT.
This comment appears to be outdated, or otherwise completely unfollowed. Also removes a few instances of untidy whitespace.
|
It seems like this build error in centos-stream-9 is unrelated to my PR, as other PRs are having the same issue (and, well, I've not touched anything that would effect that). Is there anything I should do to attempt to solve that? |
slide
approved these changes
Mar 3, 2022
timja
approved these changes
Mar 3, 2022
imonteroperez
pushed a commit
to imonteroperez/packaging
that referenced
this pull request
Mar 23, 2022
Co-authored-by: Basil Crow <me@basilcrow.com> (cherry picked from commit 762c08c)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR aims to fix the parameters that are currently ignored in the MSI installer,
PORTandINSTALLDIR.As it was, it seems that they were being stored and then ignored in favour of a different property (
PORTNUMBERandJENKINSDIRrespectively).Searching through the file for references to
INSTALLDIRandPORT, you find there are no references where these are used - including where they are stored in the registry for later retrieval (:214).An alternative would be to adjust the property names to match the internal use, but that could in theory surprise someone (though it's unlikely anyone has been successfully using these). Additionally, I was unsure where (if anywhere) these were documented.
Fixes #286
Testing
msiexec /qn /norestart /l*v "~\Desktop\latestAttempt.log" /i "~\Desktop\jenkins-2.331.msi" INSTALLDIR=C:\ Jenkins PORT=9080 JAVA_HOME=``"$JavaHome``" JENKINS_ROOT=$env:ProgramData\Jenkins\HKLM:\SOFTWARE\Jenkins\InstalledProducts\Jenkinsmatched the expected valuesChecklist