Return more error codes as return value of exe.
This commit is contained in:
24
src/main.cpp
24
src/main.cpp
@ -24,7 +24,7 @@ extern const std::string RELEASE_DATE;
|
||||
extern const std::string AUTHOR;
|
||||
extern const std::string LICENSE;
|
||||
|
||||
void print_help() {
|
||||
bool print_help() {
|
||||
std::cout << std::endl;
|
||||
maketitle("DropShell version " + VERSION);
|
||||
std::cout << std::endl;
|
||||
@ -59,6 +59,7 @@ void print_help() {
|
||||
std::cout << std::endl;
|
||||
std::cout << "Other commands available once initialised." << std::endl;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -125,15 +126,11 @@ int main(int argc, char* argv[]) {
|
||||
argvec.push_back(argv[i]);
|
||||
|
||||
|
||||
if (cmd == "autocomplete") {
|
||||
autocomplete(argvec);
|
||||
return 0;
|
||||
}
|
||||
if (cmd == "autocomplete")
|
||||
return autocomplete(argvec) ? 0 : 1;
|
||||
|
||||
if (cmd == "help" || cmd == "-h" || cmd == "--help" || cmd== "h" || cmd=="halp") {
|
||||
print_help();
|
||||
return 0;
|
||||
}
|
||||
if (cmd == "help" || cmd == "-h" || cmd == "--help" || cmd== "h" || cmd=="halp")
|
||||
return print_help() ? 0 : 1;
|
||||
|
||||
if (cmd == "edit" && argc < 3) {
|
||||
if (!gConfig().is_config_set())
|
||||
@ -190,20 +187,17 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
if (cmd == "create-template") {
|
||||
if (argc < 3) return die("Error: create-template requires a template name");
|
||||
gTemplateManager().create_template(argv[2]);
|
||||
return 0;
|
||||
return (gTemplateManager().create_template(argv[2])) ? 0 : 1;
|
||||
}
|
||||
|
||||
if (cmd == "create-server") {
|
||||
if (argc < 3) return die("Error: create-server requires a server name");
|
||||
create_server(argv[2]);
|
||||
return 0;
|
||||
return (create_server(argv[2])) ? 0 : 1;
|
||||
}
|
||||
|
||||
if (cmd == "create-service") {
|
||||
if (argc < 5) return die("Error: not enough arguments.\ndropshell create-service server template service");
|
||||
create_service(argv[2], argv[3], argv[4]);
|
||||
return 0;
|
||||
return (create_service(argv[2], argv[3], argv[4])) ? 0 : 1;
|
||||
}
|
||||
|
||||
if (cmd == "ssh" && argc < 4) {
|
||||
|
Reference in New Issue
Block a user