m/shell-scripting-templates
1
0
Fork 0
mirror of https://github.com/natelandau/shell-scripting-templates.git synced 2025-11-09 05:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed IFS handling. Added messaging

Browse Source
This commit is contained in:
Nathaniel Landau
2015-06-28 22:49:23 -04:00
parent 3bce738c34
commit 3c837bc8e9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/sharedFunctions.sh
View File

@@ -336,19 +336,24 @@ function help () {
# ----------------------------------- # -----------------------------------
function checkDependencies() { function checkDependencies() {
if [ -n "$homebrewDependencies" ]; then saveIFS=$IFS
IFS=$' \n\t'
if [ -n "${homebrewDependencies}" ]; then
warning "You are missing dependencies. We will now install them."
LISTINSTALLED="brew list" LISTINSTALLED="brew list"
INSTALLCOMMAND="brew install" INSTALLCOMMAND="brew install"
RECIPES="${homebrewDependencies}" RECIPES=("${homebrewDependencies[@]}")
# Invoke functions from setupScriptFunctions.sh # Invoke functions from setupScriptFunctions.sh
hasHomebrew hasHomebrew
doInstall doInstall
fi fi
if [ -n "$caskDependencies" ]; then if [ -n "$caskDependencies" ]; then
warning "You are missing dependencies. We will now install them."
LISTINSTALLED="brew cask list" LISTINSTALLED="brew cask list"
INSTALLCOMMAND="brew cask install --appdir=/Applications" INSTALLCOMMAND="brew cask install --appdir=/Applications"
RECIPES="${caskDependencies}" RECIPES=("${caskDependencies[@]}")
# Invoke functions from setupScriptFunctions.sh # Invoke functions from setupScriptFunctions.sh
hasHomebrew hasHomebrew
@@ -356,12 +361,14 @@ function checkDependencies() {
doInstall doInstall
fi fi
if [ -n "$gemDependencies" ]; then if [ -n "$gemDependencies" ]; then
warning "You are missing dependencies. We will now install them."
LISTINSTALLED="gem list | awk '{print $1}'" LISTINSTALLED="gem list | awk '{print $1}'"
INSTALLCOMMAND="gem install" INSTALLCOMMAND="gem install"
RECIPES="${gemDependencies}" RECIPES=("${gemDependencies[@]}")
# Invoke functions from setupScriptFunctions.sh # Invoke functions from setupScriptFunctions.sh
doInstall doInstall
fi fi
IFS=$saveIFS
} }
# pauseScript # pauseScript