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

Minor formatting changes

Browse Source
This commit is contained in:
Nathaniel Landau
2015-09-25 09:27:32 -04:00
parent c3ba67af3c
commit 6fb0bf8eca
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
setupScripts/install_command_line_tools.sh
View File

@@ -112,7 +112,7 @@ tmpDir="/tmp/${scriptName}.$RANDOM.$RANDOM.$RANDOM.$$"
# Save to Desktop use: $HOME/Desktop/${scriptBasename}.log
# Save to standard user log location use: $HOME/Library/Logs/${scriptBasename}.log
# -----------------------------------
logFile="$HOME/Library/Logs/${scriptBasename}.log"
logFile="${HOME}/Library/Logs/${scriptBasename}.log"
# Check for Dependencies
# -----------------------------------
@@ -136,16 +136,16 @@ osx_vers=$(sw_vers -productVersion | awk -F "." '{print $2}')
cmd_line_tools_temp_file="${tmpDir}/.com.apple.dt.CommandLineTools.installondemand.in-progress"
# invoke verbose usage when set
if $verbose; then v="-v" ; fi
if ${verbose}; then v="-v" ; fi
# Installing the latest Xcode command line tools on 10.9.x or higher
if [[ "$osx_vers" -ge 9 ]]; then
if [[ "${osx_vers}" -ge 9 ]]; then
# Create the placeholder file which is checked by the softwareupdate tool
# before allowing the installation of the Xcode command line tools.
touch "$cmd_line_tools_temp_file"
touch "${cmd_line_tools_temp_file}"
# Find the last listed update in the Software Update feed with "Command Line Tools" in the name
@@ -153,12 +153,12 @@ if [[ "$osx_vers" -ge 9 ]]; then
#Install the command line tools
softwareupdate -i "$cmd_line_tools" -v
softwareupdate -i "${cmd_line_tools}" -v
# Remove the temp file
if [[ -f "$cmd_line_tools_temp_file" ]]; then
rm $v "$cmd_line_tools_temp_file"
if [[ -f "${cmd_line_tools_temp_file}" ]]; then
rm ${v} "${cmd_line_tools_temp_file}"
fi
fi
@@ -168,27 +168,27 @@ fi
# instead from public download URLs, which can be found in the dvtdownloadableindex:
# https://devimages.apple.com.edgekey.net/downloads/xcode/simulators/index-3905972D-B609-49CE-8D06-51ADC78E07BC.dvtdownloadableindex
if [[ "$osx_vers" -eq 7 ]] || [[ "$osx_vers" -eq 8 ]]; then
if [[ "${osx_vers}" -eq 7 ]] || [[ "${osx_vers}" -eq 8 ]]; then
if [[ "$osx_vers" -eq 7 ]]; then
if [[ "${osx_vers}" -eq 7 ]]; then
DMGURL=http://devimages.apple.com/downloads/xcode/command_line_tools_for_xcode_os_x_lion_april_2013.dmg
fi
if [[ "$osx_vers" -eq 8 ]]; then
if [[ "${osx_vers}" -eq 8 ]]; then
DMGURL=http://devimages.apple.com/downloads/xcode/command_line_tools_for_osx_mountain_lion_april_2014.dmg
fi
TOOLS=cltools.dmg
curl "$DMGURL" -o "$TOOLS"
curl "${DMGURL}" -o "${TOOLS}"
TMPMOUNT=`/usr/bin/mktemp -d ${tmpDir}/clitools.XXXX`
hdiutil attach "$TOOLS" -mountpoint "$TMPMOUNT" -nobrowse
hdiutil attach "${TOOLS}" -mountpoint "${TMPMOUNT}" -nobrowse
# The "-allowUntrusted" flag has been added to the installer
# command to accomodate for now-expired certificates used
# to sign the downloaded command line tools.
installer -allowUntrusted -pkg "$(find $TMPMOUNT -name '*.mpkg')" -target /
hdiutil detach "$TMPMOUNT"
rm -rf $v "$TMPMOUNT"
rm $v "$TOOLS"
installer -allowUntrusted -pkg "$(find ${TMPMOUNT} -name '*.mpkg')" -target /
hdiutil detach "${TMPMOUNT}"
rm -rf ${v} "${TMPMOUNT}"
rm ${v} "${TOOLS}"
fi
####################################################