From 0fc096ec640e90c27a0663ab1dbf5bb74eb672e3 Mon Sep 17 00:00:00 2001
From: Hal Emmerich <hal@halemmerich.com>
Date: Thu, 23 May 2019 13:01:18 -0500
Subject: [PATCH] Added ascii logo to installer, removed verbose flag

---
 .../logo/icons/ascii/ascii-icon-small.txt     | 26 ++++++++++++
 .../logo/icons/ascii/ascii-icon.txt           | 40 +++++++++++++++++++
 scripts/InstallScripts/InstallPackages.sh     |  9 +++--
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100755 resources/BuildResources/logo/icons/ascii/ascii-icon-small.txt
 create mode 100755 resources/BuildResources/logo/icons/ascii/ascii-icon.txt

diff --git a/resources/BuildResources/logo/icons/ascii/ascii-icon-small.txt b/resources/BuildResources/logo/icons/ascii/ascii-icon-small.txt
new file mode 100755
index 0000000..5f9639b
--- /dev/null
+++ b/resources/BuildResources/logo/icons/ascii/ascii-icon-small.txt
@@ -0,0 +1,26 @@
+               MMMM                     
+        MMM   M   MM                     
+      MM   M   NMMMMMMDMMMMMMMMMM      
+      M                        NMMMM    
+       MNMMMMMMMMMMM                ~M  
+                    DMMMMMMMMMMMMMM   M 
+               NMMMMMMMMMMMN       M M  
+         MMMMMO7777777777777ZNMMMMMM    
+      MMD77M77OM7777777777777777NM      
+    DMZ777MM77777777777777777777M       
+   MM77777MD777777777777777777$M?       
+  MM777777DM7777777777777777MMM         
+ MM$7777777OMO77777ZMMMMMMMN            
+ M7MM77777777MMMMM=                     
+MM77MMMN7777MM                          
+MM777777ZDMM                            
+MM7777777777M                           
+ M777777777$M                           
+ MD7777777MMMM                          
+  M7777NMMZ77MM      MMM8778            
+  ?MMMN777777MMNMM M$7777OMMD           
+    MM777777MM7777M$777NMM77777D        
+      MMM77MM77777MMMMD77777$M          
+         MMMM$7777MMM$777NMMNZM         
+             ?MMMMMMD$88Z77777N         
+                     DMMMMMMM              
diff --git a/resources/BuildResources/logo/icons/ascii/ascii-icon.txt b/resources/BuildResources/logo/icons/ascii/ascii-icon.txt
new file mode 100755
index 0000000..c2e03cf
--- /dev/null
+++ b/resources/BuildResources/logo/icons/ascii/ascii-icon.txt
@@ -0,0 +1,40 @@
+                       IMMMI                                
+                    .MMMI  MM                               
+                   NM=  NMMMM                               
+          .MMMMMMM MM                                       
+         MMM    MM  MMMMMMNNDDNNNMMMMMMMMMMMMMMM~           
+         MM  MMMM        DNMMMMMNNDZ          7NMMMMMM      
+         MM                                          =MMM   
+          MMMO              ZODMMMMMMMMMMMMMMMMMMMMMM   MM  
+            8MMMMMMMMMMMMMMMMMD8~                   NMM +M  
+                                                     DM MM  
+                   NMMMMMMMMMMMMMMMMMMMMMMMMMN       MMMM   
+              MMMMMMMMMDZ$77777777777777Z8NMMMMMMMMMMMM     
+          .MMMM87MMO777$7777777777777777777777777MM$        
+         MMM7777MMO777MMM77777777777777777777777$MM         
+       MMM77777NMM777777777777777777777777777777MM          
+      MMM777777MMD77777777777777777777777777777MMM          
+     MMD7777777MMM777777777777777777777777777$MMM           
+    MM$777777777MM777777777777777777777777$MMMM             
+   MM87777777777$MMZ777777777777777$NMMMMMMMM               
+  MMMM777777777777MMM77777$DMMMMMMMMMMM                     
+ 7MMMMM777777777777NMMMMMMMMMM~                             
+ MM77DMMM7777777777MMM                                      
+ MM7777MMMMMMDOZ$DMMM                                       
+ MM77777777DMMMMMMM                                         
+ MM77777777777777MM$                                        
+ MM777777777777777MM                                        
+ MM777777777777777MM                                        
+ MMN7777777777777MMD                                        
+  MM77777777777MMMMMM                                       
+   MM$777777MMMM877OMM          DMMMMM$777                  
+   MMMNMMMMMMM7777778MMMMM   NMMMD777777MM                  
+    MMMMMD$777777777MM7$MMMMMMO7777777NMMMM8                
+     OMMN7777777777MM87777NMM7777777MMM8$$777$Z=            
+      .MMMN7777777MMM777777MMM77$MMMMD77777777M             
+         MMMMN777MMN77777777MMMMMM$777777778MD              
+            MMMMMM7777777777MMD77777777$MMMMM               
+                MMMMMMMO777MMMMMMMMMMMMMMD77777=            
+                     MMMMMMMMMM87$OZ$77777777DM             
+                              MMMMMMMMMMMMMMD               
+                                   I$MM87I                  
diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh
index 11532fb..6d5d1be 100755
--- a/scripts/InstallScripts/InstallPackages.sh
+++ b/scripts/InstallScripts/InstallPackages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash -e
 
 
 # This file is part of PrawnOS (http://www.prawnos.com)
@@ -18,8 +18,11 @@
 
 DIR=/InstallResources
 
+cat $DIR/icons/ascii-icon.txt
+echo ""
+
 while true; do
-    read -p "install (X)fce4 or (L)xqt, if unsure choose (X)fce4: " XL
+    read -p "Install (X)fce4 or (L)xqt, if unsure choose (X)fce4: " XL
     case $XL in
         [Xx]* ) DE=xfce; break;;
         [Ll]* ) DE=lxqt; break;;
@@ -53,7 +56,7 @@ then
   cp -f $DIR/xfce-config/panel/* /etc/xdg/xfce4/panel/
 
   #Copy in lightdm/light greeter settings
-  cp -f $DIR/icons/icon-small-noback.png /etc/lightdm/icon.png
+  cp -f $DIR/icons/icon-small.png /etc/lightdm/icon.png
   cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
 
   #Copy in wallpapers