Permalink
Browse files

use PE idioms instead of basename/dirname

  • Loading branch information...
1 parent 5124254 commit f15b93f272c48bc0929d5eaf73b35930af74a90a @falconindy committed Aug 24, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 squashfu
View
@@ -313,7 +313,7 @@ action_report () {
# Print totals
local grand_total=$(du -csh "$SEED" "$BINS_DIR" 2>/dev/null | awk '/total$/{ print $1 }')
- printf "\n%10s\t%25s\t%7s\n" "" "$(basename $SEED)" "$(du -h "$SEED" | awk '{print $1}')"
+ printf "\n%10s\t%25s\t%7s\n" "" "${SEED##*/}" "$(du -h "$SEED" | awk '{print $1}')"
printf "\n%10s\t%25s\t%7s\n" "" "Grand Total" "$grand_total"
popd &>/dev/null
@@ -344,7 +344,7 @@ action_restore () {
mount_squash || die "Failed to mount seed"
- IFS=$'\n' read -r -d $'\0' -a results < <(find $BINS_DIR/*/$(dirname $1)/$(basename $1) -maxdepth 0 2>/dev/null)
+ IFS=$'\n' read -r -d $'\0' -a results < <(find $BINS_DIR/*/${1%/*}/${1##*/} -maxdepth 0 2>/dev/null)
declare -a snaps
[[ -e "$SQUASH_MOUNT/$1" ]] && snaps[0]=$(stat -c %Z "$SQUASH_MOUNT/$1")
@@ -354,7 +354,7 @@ action_restore () {
die "Target not found: '$1'"
fi
- info "Found $(basename $1) in the following backups:"
+ info "Found ${1##*/}in the following backups:"
[[ -n ${snaps[0]} ]] && printf " 0\t%s\n" "$(date --date=@${snaps[0]})"
for result in "${results[@]}"; do
local bin=$(sed -n "s|$BINS_DIR/\([0-9]*\)$1|\1|p" <<< "$result")

0 comments on commit f15b93f

Please sign in to comment.