Skip to content

Commit

Permalink
fix: fix the windows installer (#5938)
Browse files Browse the repository at this point in the history
Description
---
Fixed the Windows installer whereby the merge mining proxy batch file
had the wrong prefix - `_tari_` instead of `_minitari_`.

Motivation and Context
---
The merge mining proxy did not start using the menu.

How Has This Been Tested?
---
Install test

What process can a PR reviewer use to test or verify this change?
---
Install test, then start the merge mining proxy via the menu

<!-- Checklist -->
<!-- 1. Is the title of your PR in the form that would make nice release
notes? The title, excluding the conventional commit
tag, will be included exactly as is in the CHANGELOG, so please think
about it carefully. -->


Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other - Please specify

<!-- Does this include a breaking change? If so, include this line as a
footer -->
<!-- BREAKING CHANGE: Description what the user should do, e.g. delete a
database, resync the chain -->
  • Loading branch information
hansieodendaal authored Nov 10, 2023
1 parent 2fe44db commit 3e65a28
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ A typical response would be:
```

_**Note:** A guide to setting up a local Monero stagenet on Linux can be found
[here](https://github.com/tari-project/tari/blob/development/applications/tari_merge_mining_proxy/monero_stagenet_setup.md)._
[here](https://github.com/tari-project/tari/blob/development/applications/minotari_merge_mining_proxy/monero_stagenet_setup.md)._

##### XMRig configuration

Expand Down Expand Up @@ -854,7 +854,7 @@ Tor and the required Minotari applications must be started, preferably in this o
- Tari Merge Mining Proxy:
- Linux/OSX: As per [Runtime links](#runtime-links).
- Windows: As per [Runtime links](#runtime-links) or `Start Merge Mining Proxy` menu item
or `start_tari_merge_mining_proxy` shortcut in the Tari installation folder.
or `start_minotari_merge_mining_proxy` shortcut in the Tari installation folder.

In addition, select one of the merge mining options as outlined in solo or pool mining in the next paragraphs.

Expand Down
6 changes: 3 additions & 3 deletions buildtools/windows_inno_installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#define TorServicesName "Tor Services"
#define TorServicesExeName "start_tor.bat"
#define MergeMiningProxyName "Merge Mining Proxy"
#define MergeMiningProxyExeName "start_tari_merge_mining_proxy.bat"
#define MergeMiningProxyExeName "start_minotari_merge_mining_proxy.bat"
#define MergeMiningName "XMRig"
#define MergeMiningExeName "start_xmrig.bat"
#define ReadmeName "README.txt"
Expand Down Expand Up @@ -103,7 +103,7 @@ Source: "..\applications\minotari_node\windows\start_all.lnk"; DestDir: "{app}";
Source: "..\applications\minotari_node\windows\start_minotari_node.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\applications\minotari_console_wallet\windows\start_minotari_console_wallet.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\applications\minotari_miner\windows\start_minotari_miner.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\applications\minotari_merge_mining_proxy\windows\start_tari_merge_mining_proxy.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\applications\minotari_merge_mining_proxy\windows\start_minotari_merge_mining_proxy.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\applications\minotari_merge_mining_proxy\windows\start_xmrig.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\applications\minotari_node\windows\start_tor.lnk"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#TariSuitePath}\minotari_node.exe"; DestDir: "{app}\runtime"; Flags: ignoreversion
Expand Down Expand Up @@ -175,7 +175,7 @@ Type: files; Name: "{app}\start_all.lnk"
Type: files; Name: "{app}\start_minotari_node.lnk"
Type: files; Name: "{app}\start_minotari_console_wallet.lnk"
Type: files; Name: "{app}\start_minotari_miner.lnk"
Type: files; Name: "{app}\start_tari_merge_mining_proxy.lnk"
Type: files; Name: "{app}\start_minotari_merge_mining_proxy.lnk"
Type: files; Name: "{app}\start_xmrig.lnk"
Type: files; Name: "{app}\start_tor.lnk"
Type: files; Name: "{userdesktop}\Tari All.lnk"
Expand Down

0 comments on commit 3e65a28

Please sign in to comment.