diff --git a/install.sh b/install.sh index 167de63..c53a1ee 100755 --- a/install.sh +++ b/install.sh @@ -1,28 +1,36 @@ #!/bin/bash -if ! pacman -Qs | grep -q wget; then - sudo pacman -S --noconfirm wget -fi - -java=( +## wget is for downloading TLuncher directly from their website. +## All the other packages are java packages recommended by TLauncher +## (They use java 8, but instead i'm installing the most recent java version). +pkgs_needed=( + wget jdk-openjdk jre-openjdk jre-openjdk-headless java-openjfx ) -for pkg in ${java[@]}; do - if ! pacman -Qs | grep -q $pkg; then +for pkg in ${pkgs_needed[@]} ; do + if ( ! pacman -Qs | grep -q $pkg ) ; then sudo pacman -S --noconfirm "$pkg" fi done +# Downloading TLauncher +echo -e "\n\033[1;32mDownloading TLauncher...\033[0m" + sudo wget https://tlauncher.org/jar -P src/ unzip src/jar -d src/tlauncher.d mv src/tlauncher.d/*.jar src/tlauncher.d/tlauncher.jar +# Moving TLauncher files +echo -e "\n\033[1;32mInstalling TLauncher...\033[0m" sudo mkdir /usr/share/tlauncher sudo mv src/tlauncher.d/* /usr/share/tlauncher + +sudo mv src/tlauncher /usr/bin/ sudo mv src/tlauncher.png /usr/share/icons sudo mv src/tlauncher.desktop /usr/share/applications -sudo mv src/tlauncher /usr/bin/ + +echo -e "\n\033[1;32mInstallation Complete!\033[0m" \ No newline at end of file diff --git a/src/tlauncher b/src/tlauncher index b1e779b..0c614e8 100755 --- a/src/tlauncher +++ b/src/tlauncher @@ -1,11 +1,13 @@ #!/bin/bash function update() { + echo -e "\n\033[1;32mDownloading the latest version...\033[0m" wget https://tlauncher.org/jar -P /tmp unzip /tmp/jar -d /tmp/tlauncher sudo mv /tmp/tlauncher/*.jar /usr/share/tlauncher/tlauncher.jar rm /tmp/jar rm -rf /tmp/tlauncher/ + echo -e "\n\033[1;32mDone!\033[0m" } function usage() { @@ -20,13 +22,10 @@ function usage() { while [[ "$1" ]]; do case "$1" in "--update" | "-u") - update ; exit - ;; + update ; exit ;; *) - usage ; exit - ;; + usage ; exit ;; esac - shift done diff --git a/src/tlauncher.png b/src/tlauncher.png index 85c71e5..d069c01 100644 Binary files a/src/tlauncher.png and b/src/tlauncher.png differ