Skip to content

Commit

Permalink
Fixed and fully tested mac install from path containing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianGilbert committed Oct 14, 2015
1 parent 63c41ea commit 501ebba
Showing 1 changed file with 26 additions and 25 deletions.
51 changes: 26 additions & 25 deletions mac_install
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@


# Logs the command to be run and then executes the command while logging the results. # Logs the command to be run and then executes the command while logging the results.
RunAndLog () { RunAndLog () {
echo `date` Executing $@>>"$LOGFILE" echo `date` Executing "$@">>"$LOGFILE"
$@ 1>>"$LOGFILE" 2>"$ERRORFILE" "$@" 1>>"$LOGFILE" 2>"$ERRORFILE"
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
cat "$ERRORFILE" >>"$LOGFILE" cat "$ERRORFILE" >>"$LOGFILE"
echo `date` Failure forced early exit>>"$LOGFILE" echo `date` Failure forced early exit>>"$LOGFILE"
Expand All @@ -35,18 +35,18 @@ ROOTDIR=$0
ROOTDIR=${ROOTDIR%/*} ROOTDIR=${ROOTDIR%/*}
pushd $ROOTDIR pushd $ROOTDIR
ROOTDIR=$PWD ROOTDIR=$PWD
LOGFILE=$ROOTDIR/mac_install.log LOGFILE="$ROOTDIR"/mac_install.log
ERRORFILE=$ROOTDIR/mac_install.err ERRORFILE="$ROOTDIR"/mac_install.err
GCC4ARM_VERSION=gcc-arm-none-eabi-4_8-2014q1 GCC4ARM_VERSION=gcc-arm-none-eabi-4_8-2014q1
GCC4ARM_FILENAME=gcc-arm-none-eabi-4_8-2014q1-20140314-mac.tar.bz2 GCC4ARM_FILENAME=gcc-arm-none-eabi-4_8-2014q1-20140314-mac.tar.bz2
GCC4ARM_URL=https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/$GCC4ARM_FILENAME GCC4ARM_URL=https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/$GCC4ARM_FILENAME
GCC4ARM_TAR=$ROOTDIR/$GCC4ARM_FILENAME GCC4ARM_TAR="$ROOTDIR"/$GCC4ARM_FILENAME
GCC4ARM_MD5=5d34d95a53ba545f1585b9136cbb6805 GCC4ARM_MD5=5d34d95a53ba545f1585b9136cbb6805
GCC4ARM_EXTRACT=$ROOTDIR/$GCC4ARM_VERSION GCC4ARM_EXTRACT="$ROOTDIR"/$GCC4ARM_VERSION
GCC4ARM_DIR=$ROOTDIR/gcc-arm-none-eabi GCC4ARM_DIR="$ROOTDIR"/gcc-arm-none-eabi
GCC4ARM_BINDIR=$GCC4ARM_DIR/bin GCC4ARM_BINDIR=$GCC4ARM_DIR/bin
MACBIN_DIR=$ROOTDIR/build/osx64 MACBIN_DIR="$ROOTDIR"/build/osx64
BUILDSHELL_CMD=$ROOTDIR/BuildShell BUILDSHELL_CMD="$ROOTDIR"/BuildShell




echo Logging install results to "$LOGFILE" echo Logging install results to "$LOGFILE"
Expand All @@ -70,28 +70,29 @@ if [ "$archive_match" != "1" ] ; then
fi fi


echo Extracting GNU Tools for ARM Embedded Processors... echo Extracting GNU Tools for ARM Embedded Processors...
rm -r $GCC4ARM_DIR >/dev/null 2>/dev/null rm -r "$GCC4ARM_DIR" >/dev/null 2>/dev/null
RunAndLog tar xf $GCC4ARM_TAR echo $GCC4ARM_TAR
RunAndLog mv $GCC4ARM_EXTRACT $GCC4ARM_DIR RunAndLog tar xf "$GCC4ARM_TAR"
RunAndLog mv "$GCC4ARM_EXTRACT" "$GCC4ARM_DIR"


echo Installing patched 64-bit Intel Mac OS X GDB binaries... echo Installing patched 64-bit Intel Mac OS X GDB binaries...
RunAndLog cp $MACBIN_DIR/arm-none-eabi-gdb* $GCC4ARM_BINDIR/ RunAndLog cp "$MACBIN_DIR"/arm-none-eabi-gdb* "$GCC4ARM_BINDIR/"


echo Creating helper scripts... echo Creating helper scripts...
echo "#! /usr/bin/env bash">$BUILDSHELL_CMD echo "#! /usr/bin/env bash">"$BUILDSHELL_CMD"
echo "# Modify next line and set destination drive to match mbed device">>$BUILDSHELL_CMD echo "# Modify next line and set destination drive to match mbed device">>"$BUILDSHELL_CMD"
echo "export LPC_DEPLOY='cp PROJECT.bin /Volumes/MBED/ ; sync'">>$BUILDSHELL_CMD echo "export LPC_DEPLOY='cp PROJECT.bin /Volumes/MBED/ ; sync'">>"$BUILDSHELL_CMD"
echo>>$BUILDSHELL_CMD echo>>"$BUILDSHELL_CMD"
echo "SCRIPT_PATH=\$0">>$BUILDSHELL_CMD echo "SCRIPT_PATH=\$0">>"$BUILDSHELL_CMD"
echo "SCRIPT_PATH=\${SCRIPT_PATH%/*}">>$BUILDSHELL_CMD echo "SCRIPT_PATH=\${SCRIPT_PATH%/*}">>"$BUILDSHELL_CMD"
echo "cd \$SCRIPT_PATH">>$BUILDSHELL_CMD echo "cd \$SCRIPT_PATH">>"$BUILDSHELL_CMD"
echo "SCRIPT_PATH=\$PWD">>$BUILDSHELL_CMD echo "SCRIPT_PATH=\$PWD">>"$BUILDSHELL_CMD"
echo "export PATH=\$SCRIPT_PATH/gcc-arm-none-eabi/bin:\$SCRIPT_PATH/build/osx64:\$PATH">>$BUILDSHELL_CMD echo "export PATH=\$SCRIPT_PATH/gcc-arm-none-eabi/bin:\$SCRIPT_PATH/build/osx64:\$PATH">>"$BUILDSHELL_CMD"
echo "exec bash">>$BUILDSHELL_CMD echo "exec bash">>"$BUILDSHELL_CMD"
chmod +x $BUILDSHELL_CMD chmod +x "$BUILDSHELL_CMD"


echo Cleaning up intermediate files... echo Cleaning up intermediate files...
RunAndLog rm $GCC4ARM_TAR RunAndLog rm "$GCC4ARM_TAR"


echo echo
echo To build Smoothie, you will first need to run the following script echo To build Smoothie, you will first need to run the following script
Expand Down

0 comments on commit 501ebba

Please sign in to comment.