clean up scripts

scripts/postinstall

@@ -30,15 +30,17 @@ do
                 esac
             done
             ./cs/idea.sh
-            # TODO Pycharm
+			dnf copr enable phracek/PyCharm; dnf install pycharm-community; 
             # TODO PROLOG
-            # TODO Racket
+            wget https://mirror.racket-lang.org/installers/6.8/racket-6.8-x86_64-linux.sh
+			chmod +x racket-6.8-x86_64-linux.sh
+			./racket-6.8-x86_64-linux.sh
 			./cs/logisim.sh
             ./cs/jflap.sh
             ;;
         "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 you machine."
+            This script will install mysql, mongodb, subversion, filezilla, nodejs and jGRASP on your machine."
             while true; do
                 read -p "Do you wish to continue? [y/n] " yn
                 case $yn in
@@ -49,18 +51,20 @@ do
             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"
+            echo "mysql installed see "https://dev.mysql.com/doc/mysql-yum-repo-quick-guide/en/" for further instructions. Start at step 4."
             dnf install -y mongodb
             semanage port -a -t mongod_port_t -p tcp 27017
-            dnf install -y subversion filezilla nodejs
-            #call jGRASP script here
+            dnf install -y subversion filezilla nodejs java-1.8.0-openjdk
+	        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."
             mysql_secure_installation
             echo "Install finished"
             exit
             ;;
         "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 you machine."
+            This script will install wireshark, python 2.7, python 3 and jGrasp on your machine."
             while true; do
                 read -p "Do you wish to continue? [y/n] " yn
                 case $yn in
@@ -68,16 +72,19 @@ do
                     [Nn]* ) exit;;
                 esac
             done
-            dnf install -y wireshark-gtk python python3 
+            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."
             echo "Install finished"
             exit
             ;;
         "SE")
             echo -e "Welcome to the TigerOS SE package installer script.\n
-            This script will install ruby, eclipse, Spin, sqlite3, plantUML, gitk and MIT Alloy on you machine."
+            This script will install ruby, eclipse, Spin, sqlite3, plantUML, gitk and MIT Alloy on your machine."
             while true; do
                 read -p "Do you wish to continue? [y/n] " yn
                 case $yn in

scripts/removal

@@ -19,7 +19,7 @@ PS3='Please enter the major for the courses you wish to remove: '
 options=("CS" "IT/WMC" "NSSA/CIT" "SE" "Quit")
 select opt in "${options[@]}"
 do
-    # all commands here are done with the -y flag. Individual removals do not ask the user for permission beforehand
+    # all dnf commands here are done with the -y flag. Individual removals do not ask the user for permission beforehand
     case $opt in
         "CS")
             echo -e "Welcome to the TigerOS CS package removal script.\n
@@ -32,8 +32,8 @@ do
                 esac
             done
             ./cs/idea.sh --remove       # removes Intellij IDEA
-            ./cs/logisim.sh --remove    # removes jFLAP
-            ./cs/jflap.sh --remove      # additional jFLAP removal
+            ./cs/logisim.sh --remove    # removes logisim
+            ./cs/jflap.sh --remove      # removes JFLAP
             ;;
         "IT/WMC")
             echo -e "Welcome to the TigerOS IT/WMC package removal script.\n
@@ -60,7 +60,7 @@ do
                     [Nn]* ) exit;;
                 esac
             done
-            sudo dnf -y remove wireshark python python3
+            sudo dnf -y remove wireshark
             # WARNING --> jGrasp has not been implemented in the installer script yet. Cannot remove
             echo "Install finished."
             exit
@@ -76,7 +76,8 @@ do
                 esac
             done
             sudo dnf -y remove eclipse-jdt ruby sqlite gitk plantuml
-            # Spin and Alloy need to be implemented in installer script before removal.
+            ./se/spin.sh --remove       
+			./se/alloy.sh --remove    
             echo "All files have been removed."
             exit
             ;;

scripts/se/alloy.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-# JFLAP installer script for TigerOS
-# author: Josh Bicking <jhb2345@rit.edu>
+# MIT Alloy installer script for TigerOS
+# author: Aidan Kahrs <axk4545@rit.edu>
 
 DEPS=java-1.8.0-openjdk
 PROG=Alloy
@@ -16,6 +16,16 @@ then
     echo "Please run this script as root (sudo $@$0)."
     exit
 fi
+# Check if remove flag was passed
+if [ ! -z "$1" ] && [ "$1" = "--remove" ]
+  then
+
+    rm $LINK
+    rm /usr/local/share/applications/$PROG.desktop
+    rm $FILE
+    rm /usr/local/share/icons/$PROG.jpg
+
+else 
 
 # Install dependencies
 dnf install $DEPS -y

scripts/se/spin.sh

@@ -8,6 +8,13 @@ then
     echo "Please run this script as root (sudo $@$0)."
     exit
 fi
+# Check if remove flag was passed
+if [ ! -z "$1" ] && [ "$1" = "--remove" ]
+  then
+    rm /usr/local/bin/spin
+    rm /usr/local/bin/ispin
+else
+
 wget http://spinroot.com/spin/Src/spin646.tar.gz -O /tmp/spin.tar.gz
 tar -xvf /tmp/spin.tar.gz
 cd /tmp/Spin/Src*