github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-30 06:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

add -c option for config file

Browse Source
This commit is contained in:
psychocrypt
2017-09-30 23:57:55 +02:00
parent b1ee3d2184
commit 42cc3c3a95
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/usage.md
+2 -2
View File
@@ -29,9 +29,9 @@ The number of files depends on the available backends.
The miner allow to overwrite some of the settings via command line options.
```
Usage: xmr-stak [OPTION]... [CONFIGFILE]
Usage: xmr-stak [OPTION]...
-c, --config common miner configuration file
-c, --config FILE common miner configuration file
-h, --help show this help
--noCPU disable the CPU miner backend
--cpu FILE CPU backend miner config file
xmrstak/cli/cli-miner.cpp
+24 -9
View File
@@ -60,9 +60,9 @@ void help()
using namespace std;
using namespace xmrstak;
cout<<"Usage: "<<params::inst().binaryName<<" [OPTION]... [CONFIGFILE]"<<endl;
cout<<"Usage: "<<params::inst().binaryName<<" [OPTION]..."<<endl;
cout<<" "<<endl;
cout<<" CONFIGFILE common miner configuration file"<<endl;
cout<<" -c, --config FILE common miner configuration file"<<endl;
cout<<" -h, --help show this help"<<endl;
#ifndef CONF_NO_CPU
cout<<" --noCPU disable the CPU miner backend"<<endl;
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for opName '--cpu' given");
printer::inst()->print_msg(L0, "No argument for parameter '--cpu' given");
win_exit();
return 1;
}
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for opName '--amd' given");
printer::inst()->print_msg(L0, "No argument for parameter '--amd' given");
win_exit();
return 1;
}
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for opName '--nvidia' given");
printer::inst()->print_msg(L0, "No argument for parameter '--nvidia' given");
win_exit();
return 1;
}
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for opName '-o/--url' given");
printer::inst()->print_msg(L0, "No argument for parameter '-o/--url' given");
win_exit();
return 1;
}
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for opName '-u/--user' given");
printer::inst()->print_msg(L0, "No argument for parameter '-u/--user' given");
win_exit();
return 1;
}
@@ -194,15 +194,30 @@ int main(int argc, char *argv[])
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for opName '-p/--pass' given");
printer::inst()->print_msg(L0, "No argument for parameter '-p/--pass' given");
win_exit();
return 1;
}
userSetPasswd = true;
params::inst().poolPasswd = argv[i];
}
else
else if(opName.compare("-c") == 0 || opName.compare("--config") == 0)
{
++i;
if( i >=argc )
{
printer::inst()->print_msg(L0, "No argument for parameter '-c/--config' given");
win_exit();
return 1;
}
params::inst().configFile = argv[i];
}
else
{
printer::inst()->print_msg(L0, "Parameter unknown '%s'",argv[i]);
win_exit();
return 1;
}
}
// check if we need a guided start