mirror of
https://github.com/natelandau/shell-scripting-templates.git
synced 2025-11-10 06:03:47 -05:00
minor tweaks
This commit is contained in:
@@ -124,12 +124,12 @@ function to_install() {
|
|||||||
# Install the desired items that are not already installed.
|
# Install the desired items that are not already installed.
|
||||||
function doInstall () {
|
function doInstall () {
|
||||||
list="$(to_install "${RECIPES[*]}" "$($LISTINSTALLED)")"
|
list="$(to_install "${RECIPES[*]}" "$($LISTINSTALLED)")"
|
||||||
if [[ "$list" ]]; then
|
if [[ "${list}" ]]; then
|
||||||
seek_confirmation "Confirm each install before running?"
|
seek_confirmation "Confirm each install before running?"
|
||||||
if is_confirmed; then
|
if is_confirmed; then
|
||||||
for item in ${list[@]}
|
for item in ${list[@]}
|
||||||
do
|
do
|
||||||
seek_confirmation "Install $item?"
|
seek_confirmation "Install ${item}?"
|
||||||
if is_confirmed; then
|
if is_confirmed; then
|
||||||
${INSTALLCOMMAND} $item
|
${INSTALLCOMMAND} $item
|
||||||
fi
|
fi
|
||||||
@@ -137,11 +137,11 @@ function doInstall () {
|
|||||||
else
|
else
|
||||||
for item in ${list[@]}
|
for item in ${list[@]}
|
||||||
do
|
do
|
||||||
${INSTALLCOMMAND} $item
|
${INSTALLCOMMAND} ${item}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
success "Nothing to install. You've already got them all."
|
notice "Nothing to install. You've already installed all your recipes."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +173,7 @@ brewCleanup () {
|
|||||||
hasDropbox () {
|
hasDropbox () {
|
||||||
# Confirm we have Dropbox installed
|
# Confirm we have Dropbox installed
|
||||||
notice "Confirming that Dropbox is installed..."
|
notice "Confirming that Dropbox is installed..."
|
||||||
if [ ! -e /Applications/Dropbox.app ]; then
|
if [ ! -e "/Applications/Dropbox.app" ]; then
|
||||||
notice "We don't have Dropbox. Let's get it installed."
|
notice "We don't have Dropbox. Let's get it installed."
|
||||||
seek_confirmation "Install Dropbox and all necessary prerequisites?"
|
seek_confirmation "Install Dropbox and all necessary prerequisites?"
|
||||||
if is_confirmed; then
|
if is_confirmed; then
|
||||||
|
|||||||
Reference in New Issue
Block a user