From ee5b2351d1aa8357617888bdae3a0e5c9609042f Mon Sep 17 00:00:00 2001 From: Tim Zabel Date: Mon, 24 Apr 2017 10:53:30 -0400 Subject: [PATCH] Removed jGRASP from installer and remover. Fixed Spelling errors. --- scripts/postinstall | 7 +++---- scripts/removal | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/postinstall b/scripts/postinstall index 6cacfd4..ea10099 100644 --- a/scripts/postinstall +++ b/scripts/postinstall @@ -40,7 +40,7 @@ do ;; "IT/WMC") echo -e "Welcome to the TigerOS IT/WMC package installer script. - This script will install mysql, mongodb, subversion, filezilla, nodejs and jGRASP on your machine." + This script will install mysql, mongodb, subversion, filezilla, and nodejs on your machine." while true; do read -p "Do you wish to continue? [y/n] " yn case $yn in @@ -64,7 +64,7 @@ do ;; "NSSA/CIT") echo -e "Welcome to the TigerOS NSSA/CIT package installer script.\n - This script will install wireshark, python 2.7, python 3 and jGrasp on your machine." + This script will install wireshark, python 2.7, and python 3 on your machine." while true; do read -p "Do you wish to continue? [y/n] " yn case $yn in @@ -75,10 +75,9 @@ do dnf install -y wireshark-gtk python python3 java-1.8.0-openjdk groupadd wireshark usermod -aG wireshark $USER - #call jGrasp installer script here echo "Due to licensing constraints we cannot distribute jGrasp at this time.\n Please see http://spider.eng.auburn.edu/user-cgi/grasp/grasp.pl?;dl=download_jgrasp.html for download instructions.\n - Please note that the JDK is already installed and accesibble on your system." + Please note that the JDK is already installed and accessible on your system." echo "Install finished" exit ;; diff --git a/scripts/removal b/scripts/removal index 2d0df23..4199b0f 100644 --- a/scripts/removal +++ b/scripts/removal @@ -48,11 +48,10 @@ do sudo dnf -y remove mongodb subversion filezilla nodejs php mysql-repo.rpm mysql-community-server 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") echo -e "Welcome to the TigerOS NSSA/CIT package removal script.\n - This script will remove wireshark, python 2.7, python 3, and jGrasp from your machine." + This script will remove wireshark, python 2.7, and python 3 from your machine." while true; do read -p "Do you wish to continue [y/n] " yn case $yn in @@ -61,7 +60,6 @@ do esac done sudo dnf -y remove wireshark - # WARNING --> jGrasp has not been implemented in the installer script yet. Cannot remove echo "Install finished." exit ;;