Gradle conversion, script cleanup

This commit is contained in:
Marwolf
2018-08-11 13:00:44 -04:00
parent d4d3f83aac
commit 171aa9e3e4
4 changed files with 28 additions and 19 deletions

View File

@@ -108,7 +108,7 @@ if [ "$install" == "1" ]; then
echo "sudo ufw enable"
echo ""
echo ""
echo "Do you have Oracle Java JDK 8 and Apache Ant installed already? It is required for this."
echo "Do you have Oracle Java JDK 8 and Gradle installed already? It is required for this."
echo ""
echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set"
@@ -118,7 +118,7 @@ if [ "$install" == "1" ]; then
# Ubuntu Java ===================================================>
if [ "$java" == "1" ]; then
sudo apt-get remove openjdk-6-jre default-jre default-jre-headless -y
sudo add-apt-repository ppa:webupd8team/java -y && sudo apt update && sudo apt install ant oracle-java8-set-default -y
sudo add-apt-repository ppa:webupd8team/java -y && sudo apt update && sudo apt install gradle ant oracle-java8-set-default -y
else
continue
fi
@@ -147,7 +147,7 @@ if [ "$install" == "1" ]; then
firewall-cmd --reload
echo ""
echo ""
echo "Do you have Oracle Java JDK 8 and Apache Ant installed already? It is required for this."
echo "Do you have Oracle Java JDK 8 and Gradle installed already? It is required for this."
echo ""
echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set"
@@ -156,7 +156,7 @@ if [ "$install" == "1" ]; then
# Fedora Java ===================================================>
if [ "$java" == "1" ]; then
sudo dnf -y install ant
sudo dnf -y install gradle ant
wget --no-cookies \
--no-check-certificate \
--header "Cookie: oraclelicense=accept-securebackup-cookie" \
@@ -241,7 +241,7 @@ if [ "$install" == "1" ]; then
firewall-cmd --reload
echo ""
echo ""
echo "Do you have Oracle Java JDK 8 and Apache Ant installed already? It is required for this."
echo "Do you have Oracle Java JDK 8 and Gradle installed already? It is required for this."
echo ""
echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set"
@@ -250,7 +250,7 @@ if [ "$install" == "1" ]; then
# CentOS 7 Java ===================================================>
if [ "$java" == "1" ]; then
sudo dnf -y install ant
sudo dnf -y install gradle ant
wget --no-cookies \
--no-check-certificate \
--header "Cookie: oraclelicense=accept-securebackup-cookie" \
@@ -328,7 +328,7 @@ if [ "$install" == "1" ]; then
brew install unzip wget git curl zip screen
echo ""
echo ""
echo "Do you have Oracle Java JDK 8 and Apache Ant installed already? It is required for this."
echo "Do you have Oracle Java JDK 8 and Gradle installed already? It is required for this."
echo ""
echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set"
@@ -338,7 +338,7 @@ if [ "$install" == "1" ]; then
# Mac Java ===================================================>
if [ "$java" == "1" ]; then
brew tap AdoptOpenJDK/openjdk
brew install adoptopenjdk-openjdk8
brew install adoptopenjdk-openjdk8 gradle ant
fi
# Mac Java <===================================================
@@ -402,7 +402,7 @@ if [ "$install" == "1" ]; then
echo ""
echo ""
echo "Do you have Oracle Java JDK 8 and Apache Ant installed already? It is required for this. If it fails, install manually."
echo "Do you have Oracle Java JDK 8 and Gradle installed already? It is required for this. If it fails, install manually."
echo ""
echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set"
@@ -412,7 +412,7 @@ if [ "$install" == "1" ]; then
# Other OS Java ===================================================>
if [ "$java" == "1" ]; then
sudo apt-get remove openjdk-6-jre default-jre default-jre-headless -y
sudo add-apt-repository ppa:webupd8team/java -y && sudo apt update && sudo apt install ant oracle-java8-set-default -y
sudo add-apt-repository ppa:webupd8team/java -y && sudo apt update && sudo apt install gradle ant oracle-java8-set-default -y
else
continue
fi