added more CLI options!

[gen-shell.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 3d0e2c65d6d3c9e5fed8eadc22a129743b3f9328..a570cdd792821bfee3f38891b4a2f919c4d41f19 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 using namespace std;
-std::string promptCompose();
 
 static std::vector <std::string> contexts;
 std::string composeContexts (bool pretty = false);
@@ -64,11 +63,6 @@ int promptAdd (const std::string& context)
   return 0;
 }
 
-std::string promptCompose ()
-{
-  return "% ";
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 const std::string getResponse(const std::string & prompt) {
@@ -110,10 +104,13 @@ int main(int argc, char** argv)
   // Command line arguments
   Sarge sarge;
 
+       sarge.setArgument("a", "after", "Command to execute before leaving the shell", true);
+       sarge.setArgument("b", "before", "Command to execute before entering the shell", true);
+       sarge.setArgument("c", "command", "Command to convert to shell", true);
        sarge.setArgument("h", "help", "Get help.", false);
-       sarge.setArgument("c", "cmd", "Command to execute before entering the shell", true);
-       sarge.setDescription("Make a shell from any command");
-       sarge.setUsage("gen-shell <options> <command>");
+       sarge.setArgument("p", "prompt", "Define a custom prompt", true);
+       sarge.setDescription("Make a shell from any executable");
+       sarge.setUsage("gen-shell <options>");
 
        if (!sarge.parseArguments(argc, argv)) {
                std::cerr << "Couldn't parse arguments..." << std::endl;
@@ -125,15 +122,31 @@ int main(int argc, char** argv)
     return 0;
        }
 
+  // define input command
   string arg_cmd;
-  sarge.getFlag("cmd", arg_cmd);
+  sarge.getFlag("command", arg_cmd);
   arg_cmd += " ";
 
+  // define prompt
+  string prompt = "";
+  sarge.getFlag("prompt", prompt);
+
+  if ( prompt == "" )
+    prompt = "% ";
+  else
+    prompt += " ";
+
+  // execute before-command
+  string before_command;
+  sarge.getFlag("before", before_command);
+  system (before_command.c_str ());
+
+  // execute after-command
+  string after_command;
+  sarge.getFlag("after", after_command);
+
   // Main program
   while (true) {
-    // Compose the prompt
-    auto prompt = promptCompose();
-
     // Display prompt, get input
     auto command = getResponse(prompt);
 
@@ -142,6 +155,7 @@ int main(int argc, char** argv)
       // Dispatch command
       if (command == "<EOF>")
       {
+        system (after_command.c_str ());
         return 0;
       }
       else if (command != "")