Skip to content

Commit

Permalink
Merge pull request #65 from markuskramerIgitt/master
Browse files Browse the repository at this point in the history
Revert #57 There is no UAC
  • Loading branch information
marbx authored Aug 15, 2020
2 parents f6c9662 + c7b4e24 commit 99925a3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,16 @@ The build client is where the msi installer is built.

Optionally: [Visual Studio Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WiXToolset)


### Step 1: build the Nullsoft (NSIS) exe installer
#### build the Nullsoft (NSIS) exe installer for 3001

clean_env.bat
build.bat 3001 3

YOU MUST clean_env.bat !!!

#### build the Nullsoft (NSIS) exe installer for other versions

[Building and Developing on Windows](https://docs.saltstack.com/en/latest/topics/installation/windows.html#building-and-developing-on-windows)

Expand Down
3 changes: 3 additions & 0 deletions wix.d/MinionMSI/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
</Condition>
<Condition Message="Installation requires 125 MB RAM. Found [PhysicalMemory] MB">Installed OR (PhysicalMemory > 125)</Condition>

<!-- ReadConfig_IMCAC must run immediately as Admin, the msi cannot elevate before deferred, so the user must be Admin -->
<Condition Message="Installation requires Administrator privileges. Please open from an elevated command prompt.">Privileged</Condition>

<Condition Message="Please rename MASTER_HOSTNAME to MASTER" >Installed OR NOT MASTER_HOSTNAME </Condition>
<Condition Message="Please rename MINION_HOSTNAME to MINION_ID" >Installed OR NOT MINION_HOSTNAME </Condition>
<Condition Message="Please rename START_MINION_SERVICE to START_MINION">Installed OR NOT START_MINION_SERVICE</Condition>
Expand Down

0 comments on commit 99925a3

Please sign in to comment.