Skip to content

Commit

Permalink
Merge pull request #85 from barriosnahuel/develop
Browse files Browse the repository at this point in the history
Release v2.2.0
  • Loading branch information
barriosnahuel authored Apr 15, 2019
2 parents 1f2bb75 + 00f24cf commit 94af7e1
Show file tree
Hide file tree
Showing 29 changed files with 257 additions and 182 deletions.
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Changes

## Why do we need this?
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ script:
- shellcheck modules/gimp.sh
- shellcheck modules/git.sh
- shellcheck modules/go.sh
- shellcheck modules/google-app-engine.sh
- shellcheck modules/google-drive.sh
- shellcheck modules/heroku.sh
- shellcheck modules/homebrew.sh
Expand Down
79 changes: 79 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
v2.2.0
## Added
- History changelog to let user view the diff.
- Fit POSIX standards in if statements.
- jq JSON beautifer. #84

## Changed
- Upgraded NVM and NodeJS.
- README improvements.

## Fixed
- Default theme not applied. #51
- Terminal tabs not opened automatically. #79

## Removed
- Many software which is specific for a kind of user, in favor of each user specific needs.
- 'command-not-found' plugin from Oh-My-Zsh #82.

For more info, view changes through the [milestone](https://github.com/barriosnahuel/efu/issues?q=milestone%3Av2.2.0+is%3Aclosed)

# v2.1.4
## Added
- Let users disable each module. #65
- Improvements in summary log. #65
- Documentation improvements. #65

For more info, view changes through the [milestone](https://github.com/barriosnahuel/efu/issues?q=milestone%3Av2.1.4+is%3Aclosed)

# v2.1.4
## Added
- Added Idea/AS plugins. #45
- Finder now shows hidden files. #50

## Changed
- Replaced Transmission command line client with download url. #56

## Fixed
- Fixes in Java. #52

## Removed
- Stop configuring Gradle's memory.

For more info, view changes through the [milestone](https://github.com/barriosnahuel/efu/issues?q=milestone%3Av2.1.3+is%3Aclosed)

# v2.1.2
## Fixed
- Fix current working directory after executing some modules.

# v2.1.0
## Added
- Android utilities:
- Pidcat
- ClassyShark
- Dex2Jar
- Macs Fan Control download site.

To get more detail see the [closed issues](https://github.com/barriosnahuel/efu/issues?utf8=%E2%9C%93&q=milestone%3Av2.1.0+is%3Aclosed+is%3Aissue), or if you want a really deep look just see every [merged PR](https://github.com/barriosnahuel/efu/pulls?q=milestone%3Av2.1.0+is%3Aclosed+is%3Apr).

# v2.0.0
## Added
- Support for:
- Ubuntu
- Mac OS X
- Lubuntu

To get more detail see the [closed issues](https://github.com/barriosnahuel/efu/issues?utf8=%E2%9C%93&q=milestone%3Av2.0.0+is%3Aclosed+is%3Aissue), or if you want a really deep look just see every [merged PR](https://github.com/barriosnahuel/efu/pulls?q=milestone%3Av2.0.0+is%3Aclosed+is%3Apr).

# v1.0.1
## Fixed
- Deleted some duplicted commands.

# v1.0.0
## Added
- Repo usage section in README.
- Many software for Ubuntu.

## Changed
- Gradle version as well as distribution type.
- Google Drive client
25 changes: 3 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,12 @@ EFU (Easy-Fast-Upgradable): The SH script you need to finish your Ubuntu/MacOS X
2. `cd` into downloaded directory.
3. Edit `properties.sh` with your custom info. Properties are required in order tu setup GIT.
4. `sh install.sh [osx | ubuntu | lubuntu]`

On OS X, also:
5. In a new tab of your terminal: `tail –f ~/Downloads/efu.log`
6. Once finished, take a look to: `~/Downloads/summary.efu.log`

### Ubuntu PRO tip!
If you want to run EFU on **Ubuntu**, you can just:

1. Download [latest release](https://github.com/barriosnahuel/efu/releases) on your `~/Downloads` directory.
2. `cd` into downloaded directory.
3. Edit `properties.sh` with your custom info. Properties are required in order tu setup GIT.
4.
```shell
gnome-terminal --working-directory ~/Downloads/ \
--tab -e "sh install.sh ubuntu" \
--tab -e "tail -f efu.log" \
--tab -e "tail -f summary.efu.log" \
; exit`
```

And this will open a new terminal with 3 tabs:
So you will have 3 tabs:
- One for the main script: `install.sh`*You should check this tab because it will ask you for some things.*
- One for `efu.log` output. ⇐ *Full script output.*
- One for `summary.efu.log` output. ⇐ *Most cases this will be enough.*
Expand All @@ -47,17 +34,11 @@ With a little of your interaction, EFU will:
- [ClassyShark](https://github.com/google/android-classyshark/)
- [Dex2Jar](https://github.com/pxb1988/dex2jar)
- [Pidcat](https://github.com/JakeWharton/pidcat)
- Ant
- Gimp
- GIT
- Go language
- [Google Drive command line client](https://github.com/odeke-em/drive)
- Gradle
- Grails
- Groovy
- Google App Engine SDK
- Heroku toolbelt
- Kotlin
- Maven
- [Mixxx](http://www.mixxx.org/): DJ software
- NodeJS
Expand Down
7 changes: 2 additions & 5 deletions Ubuntu/core.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Created by Nahuel Barrios on 27/3/16.

# shellcheck disable=SC1091

preInstallationLog "Gnome System Tools"
sudo apt-get -fy install gnome-system-tools
Expand Down Expand Up @@ -29,13 +29,10 @@ sudo apt-get -fy install subdownloader gmountiso freemind soundconverter steam p


if isUbuntu "$PLATFORM"; then
# shellcheck source=installAll-15.04.sh
. ./installAll-15.04.sh
fi


cd ~/Downloads/


log "Cleaning up..." &&
sudo apt-get -f install &&
sudo apt-get autoremove &&
Expand Down
4 changes: 2 additions & 2 deletions Ubuntu/installAll-15.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Created by Nahuel Barrios.


cd ~/Downloads/
cd ~/Downloads/ || (echo "Failed cding into Downloads directory, exiting..." && exit)
downloadAndInstall "GetDeb" http://archive.getdeb.net/install_deb/getdeb-repository_0.1-1~getdeb1_all.deb
downloadAndInstall "PlayDeb" http://archive.getdeb.net/install_deb/playdeb_0.3-1~getdeb1_all.deb

Expand All @@ -11,7 +11,7 @@ log "Installing Dropbox, MongoDB and WebP command line tools..."
sudo apt-get -fy install nautilus-dropbox mongodb curl webp


cd ~/Downloads/
cd ~/Downloads/ || (echo "Failed cding into Downloads directory, exiting..." && exit)
downloadAndInstall "Mega Sync client" https://mega.nz/linux/MEGAsync/xUbuntu_15.04/amd64/megasync-xUbuntu_15.04_amd64.deb
downloadAndInstall "Mega Nautilus extension" https://mega.nz/linux/MEGAsync/xUbuntu_15.04/amd64/nautilus-megasync-xUbuntu_15.04_amd64.deb
downloadAndInstall "TeamViewer" http://www.teamviewer.com/download/teamviewer_linux.deb
Expand Down
29 changes: 27 additions & 2 deletions common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
####
# Created by Nahuel Barrios on 17/3/16.
####
# shellcheck disable=SC1091

if isOsx "$PLATFORM"; then
. modules/homebrew.sh
Expand All @@ -25,36 +26,60 @@ if isLubuntu "$PLATFORM"; then
return 0
fi

# Remember that jq.sh requires Homebrew.sh.
# shellcheck source=modules/jq.sh
. modules/jq.sh

# Remember that oh-my-zsh.sh requires Homebrew.sh.
# shellcheck source=modules/oh-my-zsh.sh
. modules/oh-my-zsh.sh

# shellcheck source=modules/git.sh
. modules/git.sh

# shellcheck source=modules/ssh.sh
. modules/ssh.sh

# Remember that nodejs.sh requires Homebrew.sh.
# shellcheck source=modules/nodejs.sh
. modules/nodejs.sh

# shellcheck source=modules/ruby.sh
. modules/ruby.sh

# shellcheck source=modules/android.sh
. modules/android.sh

# shellcheck source=modules/sublime-text.sh
. modules/sublime-text.sh

# Remember that go.sh requires Homebrew.sh.
# shellcheck source=modules/go.sh
. modules/go.sh

# Remember that nodejs.sh requires go.sh.
# shellcheck source=modules/google-drive.sh
. modules/google-drive.sh

# shellcheck source=modules/java.sh
. modules/java.sh

# shellcheck source=modules/gimp.sh
. modules/gimp.sh
. modules/google-app-engine.sh

# Remember that heroku.sh requires Homebrew.sh.
# shellcheck source=modules/heroku.sh
. modules/heroku.sh

# shellcheck source=modules/tomcat.sh
. modules/tomcat.sh

# shellcheck source=modules/mixxx.sh
. modules/mixxx.sh

# sdkman at the end because SDKMAN_DIR environment variable must be at the end to work.
# shellcheck source=modules/sdkman.sh
. modules/sdkman/sdkman.sh

# Remember that maven.sh requires sdkman.sh.
# shellcheck source=modules/maven.sh
. modules/maven.sh
22 changes: 10 additions & 12 deletions createDirectoriesTree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
log "#### Creating directories tree ####"

cd ~/ &&
mkdir .gradle
mkdir Coding
cd Coding
mkdir IDEs
mkdir xDKs
mkdir servers
mkdir tools
mkdir workspace-mine
mkdir workspace-test
mkdir workspace-work

cd ~/Downloads/
mkdir .gradle ||
mkdir Coding ||
cd Coding &&
mkdir IDEs ||
mkdir xDKs ||
mkdir servers ||
mkdir tools ||
mkdir workspace-mine ||
mkdir workspace-test ||
mkdir workspace-work
1 change: 1 addition & 0 deletions functions.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh
# Created by Nahuel Barrios on 15/04/15.
# shellcheck disable=SC1090

log() {
echo "EFU ==> $1 $2 $3" &&
Expand Down
11 changes: 8 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#!/bin/bash
# Created by Nahuel Barrios on 17/3/16.
# shellcheck disable=SC1091

. ./functions.sh
log "To see the installation log run the following in a new tab of your command line: tail –f ~/Downloads/efu.log"
log "Functions loaded OK"


log "Checking platform..."
PLATFORM=$1
PLATFORM="$1"


if ! isUbuntu "$1" && ! isOsx "$1" && ! isLubuntu "$1"; then
Expand All @@ -22,6 +23,10 @@ if isOsx "$PLATFORM"; then
logInfo "Download Mac Fans Control from: http://www.crystalidea.com/macs-fan-control"
elif isUbuntu "$PLATFORM"; then
log "Detected platform <Ubuntu>"

gnome-terminal --working-directory ~/Downloads --tab -- tail -f efu.log &&
gnome-terminal --working-directory ~/Downloads --tab -- tail -f summary.efu.log

else
log "Detected platform <Lubuntu>"
fi
Expand All @@ -43,7 +48,7 @@ log "Coding directories tree created ok"


log "Loading properties file..."
cd "${CURRENT_DIR}"
cd "${CURRENT_DIR}" || (echo "Failed cding into EFU's execution directory, exiting..." && exit)
. ./properties.sh
log "Properties file loaded ok"

Expand All @@ -54,7 +59,7 @@ log "Common software installed ok"


log "Loading $PLATFORM custom installation file..."
if [ "$isUbuntu" ]; then
if isUbuntu "$PLATFORM" ; then
. ./Ubuntu/core.sh
else
# This is to show hidden files in Finder (OS X)
Expand Down
Loading

0 comments on commit 94af7e1

Please sign in to comment.