update search and show options to function properly

yyosefi · Mar 10, 2021 · 18f6c6f · 18f6c6f
1 parent f3a333f
commit 18f6c6f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/readme/CHANGELOG b/readme/CHANGELOG
@@ -1,3 +1,9 @@
+~~~~~~~~~~~~~~~~~
+version 2.4.6
+~~~~~~~~~~~~~~~~~
+
+* fix an issue with PTF prompts when using a module and typing show options
+
 ~~~~~~~~~~~~~~~~~
 version 2.4.5
 ~~~~~~~~~~~~~~~~~

diff --git a/src/core.py b/src/core.py
@@ -117,7 +117,7 @@ def count_modules():
     return counter
 
 # version information
-grab_version = "2.4.5"
+grab_version = "2.4.6"
 
 # banner
 banner = bcolors.RED + r"""

diff --git a/src/framework.py b/src/framework.py
@@ -329,26 +329,27 @@ def use_module(module, all_trigger):
                 if "use " in prompt:
                     return prompt
 
+                # options menu - was a choice here to load upon initial load of dynamically pull each time
+                # if changes are made, it makes sense to keep it loading each time
+                #if prompt.lower() == "show options":
+                #    print("Module options (%s):" % module)
+
                 # if we are searching for something
                 if "search " in prompt:
                     if search(prompt):
                         prompt("")
-                if "show " in prompt:
-                    prompt = split("/","")[1]
-                    search(prompt)
-
-                if prompt == "" or len(prompt) < 1:
-                    print_error("No prompt given. Returning to base")
-                    prompt(back)
 
+                #if "show " in prompt:
+                #    prompt = split("/","")[1]
+                #    search(prompt)
 
-                # options menu - was a choice here to load upon initial load of dynamically pull each time
-                # if changes are made, it makes sense to keep it loading each time
-                if prompt.lower() == "show options":
-                    print("Module options (%s):" % module)
+                if prompt == "" or len(prompt) < 1:
+                    print("[*] No prompt given, type help, back, show options, or run to proceed.")
+                    #prompt(back)
 
                 # if we are using a normal module
                 if module != "modules/install_update_all":
+                  if "show options" in prompt:
 
                     print("\n\n")
                     print(bcolors.BOLD + "Module Author:         " + bcolors.ENDC + author)