From fb53eaa0f77b9f943d9e8c4b478160b871a5590c Mon Sep 17 00:00:00 2001
From: ekultek <thomas.perkins23@icloud.com>
Date: Thu, 22 Feb 2018 21:39:35 -0600
Subject: [PATCH] created a new banner, made it so that banner always displays,
 fixed the 'None' issue

---
 autosploit.py |  4 ++--
 lib/banner.py | 49 ++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/autosploit.py b/autosploit.py
index 3a9cd8c..0d7782e 100644
--- a/autosploit.py
+++ b/autosploit.py
@@ -556,12 +556,12 @@ def try_shodan():
 
 if __name__ == "__main__":
 
+    logo()
+
     if len(sys.argv) > 1:
         opts = AutoSploitParser().optparser()
         AutoSploitParser().single_run_args(opts)
 
-    logo()
-
     info("Initializing AutoSploit...")
     info("One moment please while we check the Postgresql and Apache services...")
 
diff --git a/lib/banner.py b/lib/banner.py
index b5bcb6d..28b9d6c 100644
--- a/lib/banner.py
+++ b/lib/banner.py
@@ -4,17 +4,18 @@
 
 
 def banner_1(line_sep="#--", space=" " * 30):
-    print("""\033[1m\033[36m{space_sep}_____     _       _____     _     _ _
+    banner = """\033[1m\033[36m{space_sep}_____     _       _____     _     _ _
 {sep1}Author : Vector/NullArray |  _  |_ _| |_ ___|   __|___| |___|_| |_
 {sep1}Twitter: @Real__Vector    |     | | |  _| . |__   | . | | . | |  _|
 {sep1}Type   : Mass Exploiter   |__|__|___|_| |___|_____|  _|_|___|_|_|
 {sep1}Version: {v_num}                                    |_|
 ##############################################\033[0m
-    """.format(sep1=line_sep, v_num=VERSION, space_sep=space))
+    """.format(sep1=line_sep, v_num=VERSION, space_sep=space)
+    return banner
 
 
 def banner_2():
-    print(r"""
+    banner = r"""
 {blue}--+{end} {red}Graffiti the world with exploits{end} {blue}+--{end}
 {blue}--+{end}             __   ____            {blue}+--{end} 
 {blue}--+{end}            / _\ / ___)           {blue}+--{end}
@@ -23,13 +24,14 @@ def banner_2():
 {blue}--+{end}            {red}AutoSploit{end}            {blue}+--{end}
 {blue}--+{end}           NullArray/Eku          {blue}+--{end}
 {blue}--+{end}             v({red}{vnum}{end})             {blue}+--{end}
-    """.format(vnum=VERSION, blue="\033[36m", red="\033[31m", end="\033[0m"))
+    """.format(vnum=VERSION, blue="\033[36m", red="\033[31m", end="\033[0m")
+    return banner
 
 
 def banner_3():
-    print(r'''#SploitaSaurus Rex{green}
-                                           O_
-                                          /  >
+    banner = r'''#SploitaSaurusRex{green}
+                                           O_  RAWR!!
+                                          /  > 
                                         -  >  ^\
                                       /   >  ^ /   
                                     (O)  >  ^ /   / / /  
@@ -53,11 +55,12 @@ def banner_3():
                      \  \__          |   \__
                      /\____=\       /\_____=\{end} v({vnum})'''''.format(
         green="\033[1m\033[32m", end="\033[0m", vnum=VERSION
-    ))
+    )
+    return banner
 
     
 def banner_4():
-    print(r"""
+    banner = r"""
 {red}    .__.    ,     __.   .     , 	{end}
 {red}    [__]. .-+- _ (__ ._ | _ *-+-	{end}
 {red}    |  |(_| | (_).__)[_)|(_)| | 	{end}
@@ -75,13 +78,37 @@ def banner_4():
 {blue}-----+v({red}{vnum}{end})   +-----{end}
 {blue}-----------NullArray/Eku----------{end}	  
 {blue}__________________________________{end}
-	""".format(vnum=VERSION, blue="\033[36m", red="\033[31m", end="\033[0m"))
+	""".format(vnum=VERSION, blue="\033[36m", red="\033[31m", end="\033[0m")
+    return banner
+
+
+def banner_5():
+    banner = r"""
+                  {red}. '  .{end}
+               {red}' .( '.) '{end}
+       {white}_{end}     {red}('-.)' (`'.) '{end}
+      {white}|0|{end}{red}- -(  #autosploit  ){end}
+   {grey}.--{end}{white}`+'{end}{grey}--.{end}  {red}.  (' -,).(') .{end}
+   {grey}|`-----'|{end}   {red}(' .) - ('. ){end}
+   {grey}|       |{end}    {red}. (' `.  ){end}
+   {grey}|  {red}.-.{end}  {grey}|{end}       {red}` .  `{end}
+   {grey}| {red}(0.0){end}{grey} |{end}
+   {grey}| {red}>|=|<{end} {grey}|{end}
+   {grey}|  {red}`"`{end}{grey}  |{end}
+   {grey}|       |{end}
+   {grey}|       |{end}
+   {grey}`-.___.-'{end}
+   v({red}{version}{end})
+    """.format(end="\033[0m", grey="\033[36m", white="\033[37m", version=VERSION, red="\033[31m")
+    return banner
+
 
 def banner_main():
     """
     grab a random banner each run
     """
     banners = [
-        banner_4 banner_3, banner_2, banner_1
+        banner_5, banner_4,
+        banner_3, banner_2, banner_1
     ]
     return random.choice(banners)()