update: can handle command with &&

marcuwynu23 · Apr 5, 2024 · 7e23f6f · 7e23f6f
1 parent 3f91156
commit 7e23f6f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 30 deletions.
diff --git a/bin/.autofile b/bin/.autofile
@@ -1,6 +1,6 @@
 ::ASYNC
 ####################### This is a comment ############################ 
-+ notepad
++ echo Hello World > test.txt && cat test.txt
 ######################################################################
 
 
diff --git a/bin/auto.exe b/bin/auto.exe
diff --git a/makefile b/makefile
@@ -1,33 +1,23 @@
-# constants variable
+#constants variable
 BIN=bin/auto.exe
-
-
 # icon resource 
 ICO=resources/icon.rc
 RES=resources/resource.res
-
-# source files
 SRC=$(wildcard src/*.cpp)
 
-# compiling source files
+# compiling source file
 all: compile_icon compile_source
-
 # running executable
-run: $(BIN)
+run:
 	$(BIN)
+
+compile_source:
+	c++ -std=c++11 $(RES) -o $(BIN)  -I include $(SRC) 
 
-# compiling source files
-compile_source: $(BIN)
-
-$(BIN): $(SRC)
-	c++ $(CXXFLAGS) $(LDFLAGS) $(RES) -o $@ $^
-
-# compiling icon resource
-compile_icon: $(RES)
+compile_icon:
+	windres $(ICO) -O coff -o $(RES)
 
-$(RES): $(ICO)
-	windres $^ -O coff -o $@
 
 # cleaning executable
 clean:
-	del $(BIN) $(RES)
+	del $(BIN)
diff --git a/src/lib.cpp b/src/lib.cpp
@@ -96,7 +96,7 @@ void __readStringLine(std::string fileName)
             // remove the first character
             tp = tp.erase(0, 1);
             // execute the command with start -
-            string command = "start  \"" + tp + "\" cmd /K " + tp;
+            string command = "start  \"" + tp + "\" cmd /K " + "\" " + tp + "\"";
             __termExecuteAsync(command);
           }
           else if (executionType == 0)
@@ -106,7 +106,7 @@ void __readStringLine(std::string fileName)
             // remove the first character
             tp = tp.erase(0, 1);
             // execute the command with start -
-            string command = "start  \"" + tp + "\" cmd /K " + tp;
+            string command = "start  \"" + tp + "\" cmd /K " + "\" " + tp + "\"";
             __termExecuteSync(command);
           }
         }
@@ -120,7 +120,7 @@ void __readStringLine(std::string fileName)
             // remove the first character
             tp = tp.erase(0, 1);
             // execute the command with start -
-            string command = "start  /MIN \"" + tp + "\" cmd /K " + tp;
+            string command = "start  /MIN \"" + tp + "\" cmd /K " + "\" " + tp + "\"";
             __termExecuteAsync(command);
           }
           else if (executionType == 0)
@@ -130,7 +130,7 @@ void __readStringLine(std::string fileName)
             // remove the first character
             tp = tp.erase(0, 1);
             // execute the command with start -
-            string command = "start  /MIN \"" + tp + "\" cmd /K " + tp;
+            string command = "start  /MIN \"" + tp + "\" cmd /K " + "\" " + tp + "\"";
             __termExecuteSync(command);
           }
         }
@@ -143,7 +143,7 @@ void __readStringLine(std::string fileName)
             // remove the first character
             tp = tp.erase(0, 1);
             // execute the command with start -
-            string command = "start  /MIN \"" + tp + "\" cmd /C " + tp;
+            string command = "start  /B \"" + tp + "\" cmd /C " + "\" " + tp + "\"";
             __termExecuteAsync(command);
           }
           else if (executionType == 0)
@@ -153,7 +153,7 @@ void __readStringLine(std::string fileName)
             // remove the first character
             tp = tp.erase(0, 1);
             // execute the command with start -
-            string command = "start  /MIN \"" + tp + "\" cmd /C " + tp;
+            string command = "start  /B \"" + tp + "\" cmd /C " + "\" " + tp + "\"";
             __termExecuteSync(command);
           }
         }
@@ -167,6 +167,9 @@ void __readStringLine(std::string fileName)
     }
     cout << "\n End:\n " << endl;
     newfile.close();
+
+    // clear screen
+    system("cls");
   }
 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -3,15 +3,16 @@
  *   All rights reserved.
  */
 #include "lib.h"
-
 int main(int, char const **argv)
 {
   // if argv[1] is  null then set sourceFile to default '.autofile'
-  std::string sourceFile = ".autofile";
+  std::string SOURCE_FILE = ".autofile";
+
   if (argv[1] != NULL)
   {
-    sourceFile = argv[1];
+    SOURCE_FILE = argv[1];
   }
-  autoRunner(sourceFile);
+  autoRunner(SOURCE_FILE);
+
   return 0;
 }