zabpehely
/
PiShrink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from framps/master 

Handle filenames with spaces
Fixes #30
This commit is contained in:
Drew Bonasera 2017-12-07 00:17:18 -05:00 committed by GitHub
parent ff89083249 4af698457e
commit da3bf15dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pishrink.sh
View File

@ -13,13 +13,13 @@ done
shift $((OPTIND-1)) shift $((OPTIND-1))
#Args #Args
img=$1 img="$1"
#Usage checks #Usage checks
if [[ -z $img ]]; then if [[ -z "$img" ]]; then
usage usage
fi fi
if [[ ! -e $img ]]; then if [[ ! -e "$img" ]]; then
echo "ERROR: $img is not a file..." echo "ERROR: $img is not a file..."
exit -2 exit -2
fi fi
@ -43,14 +43,14 @@ if [ -n "$2" ]; then
echo "ERROR: Could not copy file..." echo "ERROR: Could not copy file..."
exit -5 exit -5
fi fi
img=$2 img="$2"
fi fi
#Gather info #Gather info
beforesize=`ls -lah $img | cut -d ' ' -f 5` beforesize=`ls -lah "$img" | cut -d ' ' -f 5`
partnum=`parted -m $img unit B print | tail -n 1 | cut -d ':' -f 1 | tr -d '\n'` partnum=`parted -m "$img" unit B print | tail -n 1 | cut -d ':' -f 1 | tr -d '\n'`
partstart=`parted -m $img unit B print | tail -n 1 | cut -d ':' -f 2 | tr -d 'B\n'` partstart=`parted -m "$img" unit B print | tail -n 1 | cut -d ':' -f 2 | tr -d 'B\n'`
loopback=`losetup -f --show -o $partstart $img` loopback=`losetup -f --show -o $partstart "$img"`
currentsize=`tune2fs -l $loopback | grep 'Block count' | tr -d ' ' | cut -d ':' -f 2 | tr -d '\n'` currentsize=`tune2fs -l $loopback | grep 'Block count' | tr -d ' ' | cut -d ':' -f 2 | tr -d '\n'`
blocksize=`tune2fs -l $loopback | grep 'Block size' | tr -d ' ' | cut -d ':' -f 2 | tr -d '\n'` blocksize=`tune2fs -l $loopback | grep 'Block size' | tr -d ' ' | cut -d ':' -f 2 | tr -d '\n'`
@ -163,12 +163,12 @@ sleep 1
losetup -d $loopback losetup -d $loopback
partnewsize=`expr $minsize \* $blocksize | tr -d '\n'` partnewsize=`expr $minsize \* $blocksize | tr -d '\n'`
newpartend=`expr $partstart + $partnewsize | tr -d '\n'` newpartend=`expr $partstart + $partnewsize | tr -d '\n'`
part1=`parted $img rm $partnum` part1=`parted "$img" rm $partnum`
part2=`parted $img unit B mkpart primary $partstart $newpartend` part2=`parted "$img" unit B mkpart primary $partstart $newpartend`
#Truncate the file #Truncate the file
endresult=`parted -m $img unit B print free | tail -1 | cut -d ':' -f 2 | tr -d 'B\n'` endresult=`parted -m "$img" unit B print free | tail -1 | cut -d ':' -f 2 | tr -d 'B\n'`
truncate -s $endresult $img truncate -s $endresult "$img"
aftersize=`ls -lah $img | cut -d ' ' -f 5` aftersize=`ls -lah "$img" | cut -d ' ' -f 5`
echo "Shrunk $img from $beforesize to $aftersize" echo "Shrunk $img from $beforesize to $aftersize"