summaryrefslogtreecommitdiffstats
path: root/xmrstak/cli/cli-miner.cpp
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2018-05-04 10:31:33 +0100
committerGitHub <noreply@github.com>2018-05-04 10:31:33 +0100
commitf8e161cf096cb371e204cc35f87ab568b41d819e (patch)
tree6dc4c795f2bf3fc28f874f2f92473d8c59bf7768 /xmrstak/cli/cli-miner.cpp
parent478a023ff62d1ebccb9547c1a152b7d296c11fb2 (diff)
parent3cd0bd9543ff26210b571fdb71128a214f091eb9 (diff)
downloadxmr-stak-f8e161cf096cb371e204cc35f87ab568b41d819e.zip
xmr-stak-f8e161cf096cb371e204cc35f87ab568b41d819e.tar.gz
Merge pull request #1535 from fireice-uk/topic-Spudz76-spellcheck
Spell check
Diffstat (limited to 'xmrstak/cli/cli-miner.cpp')
-rw-r--r--xmrstak/cli/cli-miner.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp
index 6118682..0b8ab36 100644
--- a/xmrstak/cli/cli-miner.cpp
+++ b/xmrstak/cli/cli-miner.cpp
@@ -110,7 +110,7 @@ void help()
#endif
std::string algos;
jconf::GetAlgoList(algos);
- cout<< "Supported coin opitons: " << endl << algos << endl;
+ cout<< "Supported coin options: " << endl << algos << endl;
cout<< "Version: " << get_version_str_short() << endl;
cout<<"Brought to by fireice_uk and psychocrypt under GPLv3."<<endl;
}
@@ -150,7 +150,7 @@ std::string get_multipool_entry(bool& final)
std::cin.clear(); std::cin.ignore(INT_MAX,'\n');
std::cout<<"- Password (mostly empty or x):"<<std::endl;
getline(std::cin, passwd);
-
+
std::string rigid;
std::cout<<"- Rig identifier for pool-side statistics (needs pool support). Can be empty:"<<std::endl;
getline(std::cin, rigid);
@@ -174,7 +174,7 @@ std::string get_multipool_entry(bool& final)
final = !read_yes_no("- Do you want to add another pool? (y/n)");
return "\t{\"pool_address\" : \"" + pool +"\", \"wallet_address\" : \"" + userName + "\", \"rig_id\" : \"" + rigid +
- "\", \"pool_password\" : \"" + passwd + "\", \"use_nicehash\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
+ "\", \"pool_password\" : \"" + passwd + "\", \"use_nicehash\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
bool_to_str(tls) + ", \"tls_fingerprint\" : \"\", \"pool_weight\" : " + std::to_string(pool_weight) + " },\n";
}
@@ -213,7 +213,7 @@ void do_guided_pool_config()
std::cout << "- Please enter the currency that you want to mine: "<<std::endl;
std::cout << list << std::endl;
std::cin >> tmp;
- }
+ }
currency = tmp;
}
@@ -301,7 +301,7 @@ void do_guided_pool_config()
std::cout << "Miner will mine mostly at the pool with the highest weight, unless the pool fails." << std::endl;
std::cout << "Weight must be an integer larger than 0." << std::endl;
std::cout << "- Please enter a weight for this pool: "<<std::endl;
-
+
while(!(std::cin >> pool_weight) || pool_weight <= 0)
{
std::cin.clear();
@@ -314,7 +314,7 @@ void do_guided_pool_config()
std::string pool_table;
pool_table += "\t{\"pool_address\" : \"" + pool +"\", \"wallet_address\" : \"" + userName + "\", \"rig_id\" : \"" + rigid +
- "\", \"pool_password\" : \"" + passwd + "\", \"use_nicehash\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
+ "\", \"pool_password\" : \"" + passwd + "\", \"use_nicehash\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
bool_to_str(tls) + ", \"tls_fingerprint\" : \"\", \"pool_weight\" : " + std::to_string(pool_weight) + " },\n";
if(multipool)
@@ -391,20 +391,20 @@ int main(int argc, char *argv[])
using namespace xmrstak;
std::string pathWithName(argv[0]);
- std::string seperator("/");
- auto pos = pathWithName.rfind(seperator);
+ std::string separator("/");
+ auto pos = pathWithName.rfind(separator);
if(pos == std::string::npos)
{
// try windows "\"
- seperator = "\\";
- pos = pathWithName.rfind(seperator);
+ separator = "\\";
+ pos = pathWithName.rfind(separator);
}
params::inst().binaryName = std::string(pathWithName, pos + 1, std::string::npos);
if(params::inst().binaryName.compare(pathWithName) != 0)
{
params::inst().executablePrefix = std::string(pathWithName, 0, pos);
- params::inst().executablePrefix += seperator;
+ params::inst().executablePrefix += separator;
}
params::inst().minerArg0 = argv[0];
@@ -599,7 +599,7 @@ int main(int argc, char *argv[])
win_exit();
return 1;
}
-
+
params::inst().userSetRigid = true;
params::inst().poolRigid = argv[i];
}
@@ -754,7 +754,7 @@ int main(int argc, char *argv[])
printer::inst()->print_str("!!!! Doing only a benchmark and exiting. To mine, remove the '--benchmark' option. !!!!\n");
return do_benchmark(params::inst().benchmark_block_version);
}
-
+
executor::inst()->ex_start(jconf::inst()->DaemonMode());
uint64_t lastTime = get_timestamp_ms();
OpenPOWER on IntegriCloud