Revision 214352ae

View differences:

setup.sh
336 336
#
337 337
function stm32flashSetup {
338 338
  local amirobltdir=$(dirname $(realpath ${BASH_SOURCE[0]}))
339
  local stm32flashdir=${amirobltdir}/Host/Source/stm32flash/
339
  local stm32flashdir=${amirobltdir}/Host/Source/stm32flash
340 340
  local userdir=$(pwd)
341 341

  
342 342
  # if the stm32flash folder is not empty
......
398 398

  
399 399
  # build the stm32flash tool
400 400
  printInfo "compiling stm32flash\n"
401
  userdir=${PWD}
402
  cd "$stm32flashdir"
401
  cd $stm32flashdir
403 402
  make 2>&1 | tee -a $LOG_FILE
404
  cd "$userdir"
403
  cd $userdir
405 404

  
406 405
  return 0
407 406
}
......
420 419
#                 Error: Unexpected user input.
421 420
#
422 421
function serialBootSetup {
423
  local serialbootdir=$(dirname $(realpath ${BASH_SOURCE[0]}))/Host/Source/SerialBoot/
422
  local amirobltdir=$(dirname $(realpath ${BASH_SOURCE[0]}))
423
  local serialbootdir=${amirobltdir}/Host/Source/SerialBoot
424 424
  local userdir=$(pwd)
425 425

  
426 426
  # if a build folder already exists
......
446 446

  
447 447
  # build SerialBoot
448 448
  printInfo "compiling SerialBoot...\n"
449
  mkdir ${serialbootdir}build/
450
  cd ${serialbootdir}build/
449
  mkdir ${serialbootdir}/build
450
  cd ${serialbootdir}/build
451 451
  cmake .. 2>&1 | tee -a $LOG_FILE
452 452
  make 2>&1 | tee -a $LOG_FILE
453 453
  cd $userdir

Also available in: Unified diff