Merge pull request #65 from barriosnahuel/hotfix/disable-each-module

Let users disable each module

README.md

@@ -14,7 +14,7 @@ EFU (Easy-Fast-Upgradable): The SH script you need to finish your Ubuntu/MacOS X
 ## Use it
 1. Download [latest release](https://github.com/barriosnahuel/efu/releases).
 2. `cd` into downloaded directory.
-3. Edit `properties.sh` with your custom info.
+3. Edit `properties.sh` with your custom info. Properties are required in order tu setup GIT.
 4. `sh install.sh [osx | ubuntu | lubuntu]`
 5. In a new tab of your terminal: `tail –f ~/Downloads/efu.log`
 6. Once finished, take a look to: `~/Downloads/summary.efu.log`
@@ -24,7 +24,7 @@ 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.
+3. Edit `properties.sh` with your custom info. Properties are required in order tu setup GIT.
 4. 
 ```shell
 gnome-terminal --working-directory ~/Downloads/ \
@@ -59,14 +59,13 @@ With a little of your interaction, EFU will:
   - Heroku toolbelt
   - Kotlin
   - Maven  
-  - [Mixxx](http://www.mixxx.org/)
+  - [Mixxx](http://www.mixxx.org/): DJ software
   - NodeJS 
   - [sdkman](http://sdkman.io/)
   - Tomcat  
   - ZSH and [Oh-My-ZSH](https://github.com/robbyrussell/oh-my-zsh)
 - Install (and setup) many software (OS X only):
   - Homebrew (OS X only)
-  - Transmission torrents client
 - Install (and setup) many software (Ubuntu only):
   - Common packages to compress and uncompress common files
   - Dropbox
@@ -77,16 +76,14 @@ With a little of your interaction, EFU will:
   - TeamViewer
   - WebP command line tools
   - ++
-- Suggest (with direct links) to download latest version of:
+- Suggest (with links) to download latest version of:
   - Android Studio
   - Java 7 and 8
   - [JDownloader](http://jdownloader.org/home/index)
   - JetBrains [Intellij IDEA](https://www.jetbrains.com/idea/) (EAP)
   - [Macs Fan Control](http://www.crystalidea.com/macs-fan-control)
+  - Transmission torrents client
 
-## Repo usage
-*Do not clone or push to* **master** *branch.*
-
-Create branch or fork from **develop**, then push or create pull requests (if you don't have access) to that branch.
+## Contributing
 
-The repo uses [this branching model](http://nvie.com/posts/a-successful-git-branching-model/).
+The repo uses [this branching model](http://nvie.com/posts/a-successful-git-branching-model/).

Ubuntu/core.sh

@@ -16,7 +16,7 @@ preInstallationLog "GParted with NTFS support"
 sudo apt-get -fy install gparted ntfs-3g
 
 
-logInfo "Adding repositories for Rhythmbox and its plugins..."
+log "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

common.sh

@@ -35,7 +35,6 @@ fi
 . modules/nodejs.sh
 
 . modules/android.sh
-cd "${CURRENT_DIR}"
 . modules/sublime-text.sh
 
 # Remember that go.sh requires Homebrew.sh.
@@ -46,14 +45,12 @@ cd "${CURRENT_DIR}"
 
 . modules/java.sh
 . modules/gimp.sh
-cd "${CURRENT_DIR}"
 . modules/google-app-engine.sh
 
 # Remember that heroku.sh requires Homebrew.sh.
 . modules/heroku.sh
 
 . modules/tomcat.sh
-cd "${CURRENT_DIR}"
 . modules/mixxx.sh
 
 # sdkman at the end because SDKMAN_DIR environment variable must be at the end to work.

install.sh

@@ -33,13 +33,17 @@ logInfo "Remember to download the following plugins for both IDEA/Android Studio
 logInfo "Download JDownloader2 from: http://jdownloader.org/download/index"
 
 
+# Required because we're moving away from current directory when creating directories or uncompressing software =(
 CURRENT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+
+
 log "Creating coding directories tree"
 . ./createDirectoriesTree.sh
 log "Coding directories tree created ok"
-cd "${CURRENT_DIR}"
+
 
 log "Loading properties file..."
+cd "${CURRENT_DIR}"
 . ./properties.sh
 log "Properties file loaded ok"
 

modules/android.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 17/3/16.
 
+cd "${CURRENT_DIR}"
+
 log "Configuring Android development environment..." &&
 
 if [ "$(isUbuntu "$PLATFORM")" ]; then

modules/gimp.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
 
 if [ "$(isUbuntu "$PLATFORM")" ]; then
 

modules/git.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 17/3/16.
 
+cd "${CURRENT_DIR}"
 
 if ! command -v git >/dev/null; then
 

modules/go.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 24/3/16.
 
+cd "${CURRENT_DIR}"
 
 if ! command -v go >/dev/null; then
 
     preInstallationLog "Go language"
 
     if [ "$(isUbuntu "$PLATFORM")" ]; then
 
-        logInfo "Adding repositories for Go language"
+        log "Adding repositories for Go language"
 
         sudo add-apt-repository ppa:ubuntu-lxc/lxd-stable
         sudo apt-get update

modules/google-app-engine.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
+
 preInstallationLog "Google App Engine SDK"
 
 cd ~/Coding/xDKs/

modules/google-drive.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 24/3/16.
 
+cd "${CURRENT_DIR}"
 
 if ! command -v drive >/dev/null; then
 
     preInstallationLog "Google Drive client"
 
     if [ "$(isUbuntu "$PLATFORM")" ]; then
-        logInfo "Adding repositories for Google Drive client..."
+        log "Adding repositories for Google Drive client..."
 
         sudo add-apt-repository ppa:twodopeshaggy/drive
         sudo apt-get update

modules/heroku.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
+
 if ! command -v heroku >/dev/null; then
     preInstallationLog "Heroku toolbelt"
 
@@ -16,7 +18,7 @@ if ! command -v heroku >/dev/null; then
     log "Adding existent public keys to Heroku to be able to run commands..." &&
     heroku keys:add
 
-    logInfo "Heroku account configured successfully."
+    log "Heroku account configured successfully."
 else
     logAlreadyInstalled "Heroku toolbelt"
 fi

modules/homebrew.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 18/3/16.
 
+cd "${CURRENT_DIR}"
+
 preInstallationLog "Homebrew"
 if ! command -v brew >/dev/null; then
     /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"

modules/java.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 24/3/16.
 
+cd "${CURRENT_DIR}"
 
 if grep "JAVA_HOME" ~/.zshrc; then
    logAlreadyInstalled "Java"

modules/maven.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
+
 if ! command -v mvn >/dev/null; then
     preInstallationLog "Apache Maven"
 

modules/mixxx.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
 
 if [ "$(isUbuntu "$PLATFORM")" ]; then
 
     preInstallationLog "Mixxx DJ Software"
 
-    logInfo "Adding repositories for Mixxx DJ software..."
+    log "Adding repositories for Mixxx DJ software..."
     sudo add-apt-repository ppa:mixxx/mixxx -y
     sudo apt-get update
     sudo apt-get -fy install mixxx libportaudio2

modules/nodejs.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 24/3/16.
 
+cd "${CURRENT_DIR}"
 
 if ! command -v node >/dev/null; then
     preInstallationLog "NodeJS (with NPM)"

modules/oh-my-zsh.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 24/3/16.
 
+cd "${CURRENT_DIR}"
+
 preInstallationLog "ZSH"
 if [ "$(isUbuntu "$PLATFORM")" ]; then
     sudo apt-get -fy install zsh

modules/sdkman/sdkman.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 17/3/16.
 
+cd "${CURRENT_DIR}"
 
 if ! command -v sdk >/dev/null; then
     preInstallationLog "sdkman"

modules/ssh.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
+
 logInfo "Generating a new SSH Key for $USER_EMAIL" &&
 
 # Creates a new ssh key, using the provided email as a label

modules/sublime-text.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
 
 if [ "$(isUbuntu "$PLATFORM")" ]; then
-    logInfo "Adding repositories for Sublime Text 3..."
+    log "Adding repositories for Sublime Text 3..."
     sudo add-apt-repository ppa:webupd8team/sublime-text-3 -y
     sudo apt-get update
 

modules/tomcat.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 25/3/16.
 
+cd "${CURRENT_DIR}"
+
 preInstallationLog "Apache Tomcat"
 
 cd ~/Coding/servers/

properties.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 # Created by Nahuel Barrios on 24/3/16.
 
+#########################################
+#### Will be used for in GIT module. ####
+#########################################
 USER_FULL_NAME="Nahuel Barrios"
 USER_EMAIL="[email protected]"