From edf65b55a7b2d90b44396f66d0594793d673064d Mon Sep 17 00:00:00 2001
From: axk4545 <abkahrs@gmail.com>
Date: Sun, 16 Apr 2017 12:40:45 -0400
Subject: [PATCH] clean up spacing and fix selinux and wireshark stuff

---
 scripts/postinstall | 21 +++++++++++----------
 scripts/removal     |  3 ++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/scripts/postinstall b/scripts/postinstall
index 0700577..c9c3b50 100755
--- a/scripts/postinstall
+++ b/scripts/postinstall
@@ -42,14 +42,15 @@ do
             esac
             done
             wget https://dev.mysql.com/get/mysql57-community-release-fc25-9.noarch.rpm -O mysql-repo.rpm
-             dnf install -y mysql-repo.rpm
-             dnf install -y mysql-community-server
-            echo "mysql installed see https://dev.mysql.com/doc/mysql-yum-repo-quick-guide/en/ step 4 for further instructions"
-             dnf install -y mongodb
-             semanage port -a -t mongod_port_t -p tcp 27017
+            dnf install -y mysql-repo.rpm
+            dnf install -y mysql-community-server
+            echo "mysql installed see "https://dev.mysql.com/doc/mysql-yum-repo-quick-guide/en/" step 4 for further instructions"
+            dnf install -y mongodb
+            semanage port -a -t mongod_port_t -p tcp 27017
             # dnf install -y httpd
-             dnf install -y subversion filezilla nodejs php
-                  #call jGRASP script here
+            dnf install -y subversion filezilla nodejs php
+            #call jGRASP script here
+            mysql_secure_installation
             echo "Install finished"
             exit
             ;;
@@ -63,7 +64,7 @@ do
             [Nn]* ) exit;;
             esac
             done
-             dnf install -y wireshark python python3 
+            dnf install -y wireshark-gtk python python3 
             #call jGrasp installer script here
             echo "Install finished"
             exit
@@ -78,8 +79,8 @@ do
             [Nn]* ) exit;;
             esac
             done
-             dnf install -y eclipse-jdt ruby sqlite 
-           ./se/spin.sh && ./se/alloy.sh 
+            dnf install -y eclipse-jdt ruby sqlite 
+            ./se/spin.sh && ./se/alloy.sh 
             echo "Install finished"
             exit
             ;;
diff --git a/scripts/removal b/scripts/removal
index d5888d8..ad1fa41 100755
--- a/scripts/removal
+++ b/scripts/removal
@@ -43,7 +43,8 @@ do
                 esac
             done
             sudo dnf remove mongodb subversion filezilla nodejs php mysql-repo.rpm mysql-community-server
-            # port 27017 is still open. Need to figure out how to revert that
+			semanage port -d -t mongod_port_t -p tcp 27017
+			firewall-cmd --del-port=22017/tcp --permanent && firewall-cmd --reload
             # jGrasp installer script must be implemented before it can be removed.
             ;;
         "NSSA/CIT")