From b37adc00bdffdcd2dd7d4cb233e161c40a7ab16f Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 11:55:46 -0300 Subject: [PATCH 1/7] Fix typo in log messages --- Ubuntu/core.sh | 2 +- Ubuntu/installAll-14.10.sh | 4 ++-- modules/sublime-text.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Ubuntu/core.sh b/Ubuntu/core.sh index af1e38f..98b9e2e 100644 --- a/Ubuntu/core.sh +++ b/Ubuntu/core.sh @@ -20,7 +20,7 @@ logInfo "Adding repositories for Rhythmbox and its plugins..." sudo add-apt-repository ppa:fossfreedom/rhythmbox -y sudo add-apt-repository ppa:fossfreedom/rhythmbox-plugins -y sudo apt-get update -logInfo "Instaling latest Rhythmbox and its plugins..." +logInfo "Installing latest Rhythmbox and its plugins..." sudo apt-get -fy install rhythmbox rhythmbox-plugin-rhythmweb rhythmbox-plugin-equalizer rhythmbox-plugin-opencontainingfolder rhythmbox-plugin-llyrics diff --git a/Ubuntu/installAll-14.10.sh b/Ubuntu/installAll-14.10.sh index a4d2b3c..948c6af 100644 --- a/Ubuntu/installAll-14.10.sh +++ b/Ubuntu/installAll-14.10.sh @@ -73,10 +73,10 @@ else rm -f google-chrome-stable_current_i386.deb fi -echo "==> - EFU: Instaling latest Rhythmbox and its plugins..." +echo "==> - EFU: Installing latest Rhythmbox and its plugins..." sudo apt-get -fy install rhythmbox rhythmbox-plugin-rhythmweb rhythmbox-plugin-equalizer rhythmbox-plugin-opencontainingfolder rhythmbox-plugin-llyrics -echo "==> - EFU: Instaling Sublime Text 3, GIT, MongoDB, Curl and WebP command line tools..." +echo "==> - EFU: Installing Sublime Text 3, GIT, MongoDB, Curl and WebP command line tools..." sudo apt-get -fy install sublime-text-installer git-core mongodb curl webp echo "==> - EFU: Installing packages to compress and extract different kind of files..." diff --git a/modules/sublime-text.sh b/modules/sublime-text.sh index 11297e3..51b6488 100644 --- a/modules/sublime-text.sh +++ b/modules/sublime-text.sh @@ -10,7 +10,7 @@ if isUbuntu "$PLATFORM" ; then sudo add-apt-repository ppa:webupd8team/sublime-text-3 -y sudo apt-get update - logInfo "Instaling Sublime Text 3" + logInfo "Installing Sublime Text 3" sudo apt-get -fy install sublime-text-installer postInstallationLog "Sublime Text 3" From d8e3dafc11149efb67b95601dd018b9d23ad9d4d Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 11:56:35 -0300 Subject: [PATCH 2/7] Fix Sublime Text APT repository --- CHANGELOG.md | 5 +++++ modules/sublime-text.sh | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc2db1b..4b44267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v2.6.0 +## Fixed +- Typo in log messages. +- Sublime Text APT repository. + # v2.5.0 ## Added - Add curl to core Ubuntu/Lubuntu module. #113 diff --git a/modules/sublime-text.sh b/modules/sublime-text.sh index 51b6488..96915b8 100644 --- a/modules/sublime-text.sh +++ b/modules/sublime-text.sh @@ -7,11 +7,13 @@ if isUbuntu "$PLATFORM" ; then preInstallationLog "Sublime Text 3" logInfo "Adding repositories for Sublime Text 3..." - sudo add-apt-repository ppa:webupd8team/sublime-text-3 -y + wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add - + sudo apt-get install apt-transport-https + echo "deb https://download.sublimetext.com/ apt/stable/" | sudo tee /etc/apt/sources.list.d/sublime-text.list sudo apt-get update logInfo "Installing Sublime Text 3" - sudo apt-get -fy install sublime-text-installer + sudo apt-get -fy install sublime-text postInstallationLog "Sublime Text 3" else From ede61dbea97590676b2f6a25280c3832dc75fa31 Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 12:01:53 -0300 Subject: [PATCH 3/7] Remove Heroku toolbelt. --- .travis.yml | 1 - CHANGELOG.md | 3 +++ README.md | 3 +-- common.sh | 4 ---- modules/heroku.sh | 27 --------------------------- 5 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 modules/heroku.sh diff --git a/.travis.yml b/.travis.yml index c9f362c..2d32896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ script: - shellcheck modules/gimp.sh - shellcheck modules/git.sh - shellcheck modules/google-drive.sh - - shellcheck modules/heroku.sh - shellcheck modules/homebrew.sh - shellcheck modules/java.sh - shellcheck modules/maven.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b44267..2f912e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ - Typo in log messages. - Sublime Text APT repository. +## Removed +- Heroku toolbelt. + # v2.5.0 ## Added - Add curl to core Ubuntu/Lubuntu module. #113 diff --git a/README.md b/README.md index 98a7f12..c966443 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,7 @@ With a little of your interaction, EFU will: - [Pidcat](https://github.com/JakeWharton/pidcat) - Gimp - GIT - - Heroku toolbelt - - Maven + - Maven - [Mixxx](http://www.mixxx.org/): DJ software - NodeJS - [sdkman](http://sdkman.io/) diff --git a/common.sh b/common.sh index 9098aaa..181f39a 100644 --- a/common.sh +++ b/common.sh @@ -63,10 +63,6 @@ logSummary "Added ~/Coding/tools to PATH" # shellcheck source=modules/gimp.sh . modules/gimp.sh -# Remember that heroku.sh requires Homebrew.sh. -# shellcheck source=modules/heroku.sh -. modules/heroku.sh - # shellcheck source=modules/tomcat.sh . modules/tomcat.sh diff --git a/modules/heroku.sh b/modules/heroku.sh deleted file mode 100644 index 7dbda5d..0000000 --- a/modules/heroku.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Created by Nahuel Barrios on 25/3/16. - -enterDirOrExit "${CURRENT_DIR}" - -if ! command -v heroku >/dev/null; then - preInstallationLog "Heroku toolbelt" - - if isUbuntu "$PLATFORM" ; then - wget -qO- "https://toolbelt.heroku.com/install-ubuntu.sh" | sh - else - brew install heroku-toolbelt - fi - postInstallationLog "Heroku toolbelt" - - logWarn "Please login to Heroku with your account." - heroku login && - logWarn "Adding existent public keys to Heroku to be able to run commands..." && - heroku keys:add - - logSummary "Heroku account configured successfully." -else - logAlreadyInstalled "Heroku toolbelt" -fi - -logProgramVersion "Heroku toolbelt" "$(heroku version)" - From 784c537a7f3618efa11b13384387a5c5fb5330bc Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 12:05:36 -0300 Subject: [PATCH 4/7] Upgrade Tomcat to v9.0.31 --- CHANGELOG.md | 3 +++ modules/tomcat.sh | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f912e3..1300328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # v2.6.0 +## Changed +- Apache Tomcat upgrade to v9.0.31. + ## Fixed - Typo in log messages. - Sublime Text APT repository. diff --git a/modules/tomcat.sh b/modules/tomcat.sh index ebfb5db..7b1a8bc 100644 --- a/modules/tomcat.sh +++ b/modules/tomcat.sh @@ -6,8 +6,7 @@ enterDirOrExit "${CURRENT_DIR}" preInstallationLog "Apache Tomcat" enterDirOrExit ~/Coding/servers/ - -TOMCAT_DOWNLOAD_URL=http://apache.dattatec.com/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.zip +TOMCAT_DOWNLOAD_URL=https://downloads.apache.org/tomcat/tomcat-9/v9.0.31/bin/apache-tomcat-9.0.31.zip downloadAndUncompress "Apache Tomcat" "$TOMCAT_DOWNLOAD_URL" TOMCAT_DIRECTORY=$(getFileNameWithoutExtension "$(getFileName "$TOMCAT_DOWNLOAD_URL")") From bc8c15382650cc10de60b13f3bb2bf94b0ff9015 Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 12:09:25 -0300 Subject: [PATCH 5/7] Update README.md download script to v2.6.0 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c966443..129a587 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,10 @@ So you will have 3 tabs: Tip: For CMD lovers... ``` -wget --content-disposition https://codeload.github.com/barriosnahuel/efu/zip/v2.5.0 \ -&& unzip efu-2.5.0.zip \ -&& rm -rf efu-2.5.0.zip \ -&& cd efu-2.5.0 \ +wget --content-disposition https://codeload.github.com/barriosnahuel/efu/zip/v2.6.0 \ +&& unzip efu-2.6.0.zip \ +&& rm -rf efu-2.6.0.zip \ +&& cd efu-2.6.0 \ && sh install.sh ubuntu ``` From 8c1168b59973eadd8739fc3242c2760e18099b4d Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 12:15:50 -0300 Subject: [PATCH 6/7] Install Ubuntu core before custom (i.e. to install curl before using it) --- CHANGELOG.md | 1 + install.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1300328..8074660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## Fixed - Typo in log messages. - Sublime Text APT repository. +- Ubuntu core software now it's installed ok and before custom software. ## Removed - Heroku toolbelt. diff --git a/install.sh b/install.sh index f19d361..21f6502 100644 --- a/install.sh +++ b/install.sh @@ -71,17 +71,17 @@ enterDirOrExit "${CURRENT_DIR}" logInfo "Properties file loaded ok" -logInfo "Loading common software installation" -. ./common.sh -logInfo "Common software installed ok" - - if isUbuntu "$PLATFORM" ; then logInfo "Loading $PLATFORM custom installation file..." . ./Ubuntu/core.sh fi +logInfo "Loading common software installation" +. ./common.sh +logInfo "Common software installed ok" + + logInfo "#### Installation of your favorite software has finished ####" logInfo "Thanks for using me! -- Don't forget to fork me on Github: http://github.com/barriosnahuel/efu" logInfo "To see the installation log run the following on the command line: 'tail –f ~/Downloads/efu.log'" From 47b491a00f0cde69bb7e137ec9b154fe4e315569 Mon Sep 17 00:00:00 2001 From: Nahuel Barrios Date: Sun, 15 Mar 2020 12:19:42 -0300 Subject: [PATCH 7/7] Remove Freemind --- CHANGELOG.md | 1 + Ubuntu/core.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8074660..805b06d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ## Removed - Heroku toolbelt. +- Freemind because it's no longer being developed. # v2.5.0 ## Added diff --git a/Ubuntu/core.sh b/Ubuntu/core.sh index 98b9e2e..b0fcfd6 100644 --- a/Ubuntu/core.sh +++ b/Ubuntu/core.sh @@ -24,8 +24,8 @@ logInfo "Installing latest Rhythmbox and its plugins..." sudo apt-get -fy install rhythmbox rhythmbox-plugin-rhythmweb rhythmbox-plugin-equalizer rhythmbox-plugin-opencontainingfolder rhythmbox-plugin-llyrics -preInstallationLog "Curl, Subdownloader, GMountISO, Freemind (a mind maps editor), Sound Converter, Steam client (will update on first run) and PlayOnLinux" -sudo apt-get -fy install curl subdownloader gmountiso freemind soundconverter steam playonlinux +preInstallationLog "Curl, Subdownloader, GMountISO, Sound Converter, Steam client (will update on first run) and PlayOnLinux" +sudo apt-get -fy install curl subdownloader gmountiso soundconverter steam playonlinux postInstallationLog "Subdownloader, GMountISO, Freemind (a mind maps editor), Sound Converter, Steam client (will update on first run) and PlayOnLinux"