Skip to content

Commit

Permalink
Merge pull request #116 from barriosnahuel/fix/many-things
Browse files Browse the repository at this point in the history
Fix many things after testing on a clean Ubuntu installation
barriosnahuel authored Mar 15, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 788e556 + 47b491a commit 9cf4d50
Showing 10 changed files with 34 additions and 53 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# v2.6.0
## Changed
- Apache Tomcat upgrade to v9.0.31.

## Fixed
- Typo in log messages.
- Sublime Text APT repository.
- Ubuntu core software now it's installed ok and before custom software.

## Removed
- Heroku toolbelt.
- Freemind because it's no longer being developed.

# v2.5.0
## Added
- Add curl to core Ubuntu/Lubuntu module. #113
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
```

@@ -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/)
6 changes: 3 additions & 3 deletions Ubuntu/core.sh
Original file line number Diff line number Diff line change
@@ -20,12 +20,12 @@ 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


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"


4 changes: 2 additions & 2 deletions Ubuntu/installAll-14.10.sh
Original file line number Diff line number Diff line change
@@ -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..."
4 changes: 0 additions & 4 deletions common.sh
Original file line number Diff line number Diff line change
@@ -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

10 changes: 5 additions & 5 deletions install.sh
Original file line number Diff line number Diff line change
@@ -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'"
27 changes: 0 additions & 27 deletions modules/heroku.sh

This file was deleted.

8 changes: 5 additions & 3 deletions modules/sublime-text.sh
Original file line number Diff line number Diff line change
@@ -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 "Instaling Sublime Text 3"
sudo apt-get -fy install sublime-text-installer
logInfo "Installing Sublime Text 3"
sudo apt-get -fy install sublime-text

postInstallationLog "Sublime Text 3"
else
3 changes: 1 addition & 2 deletions modules/tomcat.sh
Original file line number Diff line number Diff line change
@@ -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")")

0 comments on commit 9cf4d50

Please sign in to comment.