Merge pull request #15 from cosckoya/feature/new-hierarchy

Hierarchy done

cloud/Makefile

@@ -46,5 +46,5 @@ google: ## Install Google SDK (glcoud)
 	@echo "Installing Google SDK" ;\
 	sudo sh -c "echo 'deb https://packages.cloud.google.com/apt cloud-sdk main' > /etc/apt/sources.list.d/google-cloud-sdk.list" ;\
 	curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - ;\
-	sudo sh -c "apt update -qq && apt install -qq -y --no-install-recommends google-cloud-sdk"
+	sudo sh -c "apt-get update -qq && apt-get install -qq -y --no-install-recommends google-cloud-sdk"
 	@echo "GCloud SDK done!"

container/Makefile

@@ -95,7 +95,7 @@ docker-compose: ## Install Docker-compose
 dive: ## Install Dive
 	@echo "Installing Dive" ;\
 	curl --silent "https://api.github.com/repos/wagoodman/dive/releases/latest" | jq -r '.assets[].browser_download_url' | grep deb | xargs wget -q - ;\
-  sudo bash -c "apt install -f ./*.deb" ;\
+	sudo sh -c "apt-get install -f ./*.deb" ;\
 	rm *.deb* ;\
 	dive version
 	@echo "Dive Installed"

profile/Makefile

@@ -35,19 +35,19 @@ bash: ## Install Bash profile
 
 zsh: ## Sets ZSH as default Shell, and install ZSH profile and zplug with plugins
 	@echo "Setting up ZSH profile" ;\
-	sudo sh -c "apt update -qq && apt install -qq -y --no-install-recommends zsh" ;\
+	sudo sh -c "apt-get update -qq && apt-get install -qq -y --no-install-recommends zsh" ;\
 	sudo sh -c "usermod --shell /bin/zsh ${USER}" ;\
 	ln -s -f ${PROFILE}/zshrc ${HOME}/.zshrc
 
 neovim: ## Install Vim/Neovim profile and vimplug plugins
 	@echo "Setting up NeoVIM" ;\
-	sudo bash -c "apt update -qq && apt install -qq -y --no-install-recommends neovim vim" ;\
+	sudo sh -c "apt-get update -qq && apt-get install -qq -y --no-install-recommends neovim vim" ;\
 	mkdir -p ~/.config/nvim ;\
 	ln -s -f ${PROFILE}/vimrc ${HOME}/.config/nvim/init.vim ;\
 	ln -s -f ${PROFILE}/vimrc ${HOME}/.vimrc
 
 tmux: ## Install TMUX profile
 	@echo "Setting up TMUX" ;\
-	sudo bash -c "apt update -qq && apt install -qq -y --no-install-recommends tmux" ;\
+	sudo sh -c "apt-get update -qq && apt-get install -qq -y --no-install-recommends tmux" ;\
 	wget -q https://raw.githubusercontent.com/gpakosz/.tmux/master/.tmux.conf -O ${HOME}/.tmux.conf ;\
 	ln -s -f ${PROFILE}/tmux.local ${HOME}/.tmux.conf.local

tools/Makefile

@@ -54,7 +54,7 @@ terraform: ## Install Terraform. Set version with `make terraform TERRAFORM_VERS
 	rm terraform.zip ;\
 	${HOME}/bin/terraform version
 	@echo "Terraform done!"
-	
+
 tflint: ## Install / Updrade TFLint util
 	@echo "Installing Terraform Linter: tflint" ;\
 	wget -q https://github.com/terraform-linters/tflint/releases/latest/download/tflint_linux_amd64.zip ;\
@@ -85,13 +85,13 @@ pre-commit: ## Install Pre-Commit
 
 tig: ## Install Tig
 	@echo "Installing Tig" ;\
-	sudo sh -c "apt update -qq && apt install -qq -y --no-install-recommends tig"
+	sudo sh -c "apt-get update -qq && apt-get install -qq -y --no-install-recommends tig"
 	@echo "Tig done!"
 
 gh-cli: ## Install Github Cli
 	@echo "Install Github Cli" ;\
 	curl --silent "https://api.github.com/repos/cli/cli/releases/latest" | jq -r '.assets[].browser_download_url' | grep linux_amd64.deb | xargs wget ;\
-	sudo bash -c "apt-get install -f ./*.deb" ;\
+	sudo sh -c "apt-get install -f ./*.deb" ;\
 	rm *.deb* ;\
 	gh version
 	@echo "Github cli installed!"