Browse code

hopedfully fix broken FreeBSD output

Nat! authored on 04-01-2016 01:26:54
Showing 1 changed files
... ...
@@ -393,6 +393,7 @@ bootstrap_auto_update()
393 393
    log_info "Recursively acquiring ${dir} .bootstrap settings ..."
394 394
 
395 395
    local old
396
+   local name
396 397
 
397 398
    old="${IFS:-" "}"
398 399
 
... ...
@@ -419,7 +420,8 @@ bootstrap_auto_update()
419 420
             then
420 421
                exekutor cp "${BOOTSTRAP_SUBDIR}/${i}" "${BOOTSTRAP_SUBDIR}.tmp/${i}" || exit 1
421 422
             else
422
-               log_fluff "Setting \"`basename -- ${i}`\" is not specified, so not inherited"
423
+               name="`basename -- "${i}"`"
424
+               log_fluff "Setting \"${name}\" is not specified, so not inherited"
423 425
             fi
424 426
          fi
425 427
       done
... ...
@@ -446,9 +448,10 @@ bootstrap_auto_update()
446 448
       IFS="{old}"
447 449
       srcfile="${dir}/.bootstrap/${i}"
448 450
       dstfile="${BOOTSTRAP_SUBDIR}.auto/${i}"
451
+      name="`basename -- "${i}"`"
449 452
       if [ -f "${srcfile}" ]
450 453
       then
451
-         log_fluff "Inheriting \"`basename -- ${i}`\" from \"${srcfile}\""
454
+         log_fluff "Inheriting \"${name}\" from \"${srcfile}\""
452 455
 
453 456
          mkdir_if_missing "${BOOTSTRAP_SUBDIR}.auto/`dirname -- "${i}"`"
454 457
          if [ -f "${BOOTSTRAP_SUBDIR}.auto/${i}" ]
... ...
@@ -464,7 +467,7 @@ bootstrap_auto_update()
464 467
             exekutor cp "${srcfile}" "${dstfile}" || exit 1
465 468
          fi
466 469
       else
467
-         log_fluff "Setting \"`basename -- ${i}`\" is not specified, so not inherited"
470
+         log_fluff "Setting \"${name}\" is not specified, so not inherited"
468 471
       fi
469 472
    done
470 473
    IFS="{old}"