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

Add double quote to prevent globbing and word splitting

This commit is contained in:
Drew Bonasera 2019-08-27 01:11:27 -04:00
parent 562142b841
commit 27f8780508
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pishrink.sh
View File

@ -39,12 +39,12 @@ function error() {
} }
function cleanup() { function cleanup() {
if losetup $loopback &>/dev/null; then if losetup "$loopback" &>/dev/null; then
losetup -d "$loopback" losetup -d "$loopback"
fi fi
if [ "$debug" = true ]; then if [ "$debug" = true ]; then
local old_owner=$(stat -c %u:%g "$src") local old_owner=$(stat -c %u:%g "$src")
chown $old_owner "$LOGFILE" chown "$old_owner" "$LOGFILE"
fi fi
} }
@ -105,7 +105,7 @@ help() {
-r: Try to repair corrupted filesystem -r: Try to repair corrupted filesystem
-p: Try to repair corrupted filesystem in paranoia mode -p: Try to repair corrupted filesystem in paranoia mode
EOM EOM
echo $help echo "$help"
exit -1 exit -1
} }
@ -138,7 +138,7 @@ shift $((OPTIND-1))
if [ "$debug" = true ]; then if [ "$debug" = true ]; then
info "Creating log file $LOGFILE" info "Creating log file $LOGFILE"
rm $LOGFILE &>/dev/null rm "$LOGFILE" &>/dev/null
exec 1> >(stdbuf -i0 -o0 -e0 tee -a "$LOGFILE" >&1) exec 1> >(stdbuf -i0 -o0 -e0 tee -a "$LOGFILE" >&1)
exec 2> >(stdbuf -i0 -o0 -e0 tee -a "$LOGFILE" >&2) exec 2> >(stdbuf -i0 -o0 -e0 tee -a "$LOGFILE" >&2)
fi fi
@ -161,14 +161,10 @@ if (( EUID != 0 )); then
error $LINENO "You need to be running as root." error $LINENO "You need to be running as root."
exit -3 exit -3
fi fi
if [[ -z "$2" ]] && [[ $repair == true || $paranoia == true ]]; then
error $LINENO "Option -r and -p require to specify newimagefile.img."
exit -3
fi
#Check that what we need is installed #Check that what we need is installed
for command in parted losetup tune2fs md5sum e2fsck resize2fs; do for command in parted losetup tune2fs md5sum e2fsck resize2fs; do
which $command 2>&1 >/dev/null command -v $command >/dev/null 2>&1
if (( $? != 0 )); then if (( $? != 0 )); then
error $LINENO "$command is not installed." error $LINENO "$command is not installed."
exit -4 exit -4
@ -184,7 +180,7 @@ if [ -n "$2" ]; then
exit -5 exit -5
fi fi
old_owner=$(stat -c %u:%g "$1") old_owner=$(stat -c %u:%g "$1")
chown $old_owner "$2" chown "$old_owner" "$2"
img="$2" img="$2"
fi fi
@ -197,7 +193,7 @@ beforesize=$(ls -lh "$img" | cut -d ' ' -f 5)
parted_output=$(parted -ms "$img" unit B print | tail -n 1) parted_output=$(parted -ms "$img" unit B print | tail -n 1)
partnum=$(echo "$parted_output" | cut -d ':' -f 1) partnum=$(echo "$parted_output" | cut -d ':' -f 1)
partstart=$(echo "$parted_output" | cut -d ':' -f 2 | tr -d 'B') partstart=$(echo "$parted_output" | cut -d ':' -f 2 | tr -d 'B')
loopback=$(losetup -f --show -o $partstart "$img") loopback=$(losetup -f --show -o "$partstart" "$img")
tune2fs_output=$(tune2fs -l "$loopback") tune2fs_output=$(tune2fs -l "$loopback")
currentsize=$(echo "$tune2fs_output" | grep '^Block count:' | tr -d ' ' | cut -d ':' -f 2) currentsize=$(echo "$tune2fs_output" | grep '^Block count:' | tr -d ' ' | cut -d ':' -f 2)
blocksize=$(echo "$tune2fs_output" | grep '^Block size:' | tr -d ' ' | cut -d ':' -f 2) blocksize=$(echo "$tune2fs_output" | grep '^Block size:' | tr -d ' ' | cut -d ':' -f 2)
@ -210,7 +206,7 @@ if [ "$should_skip_autoexpand" = false ]; then
mountdir=$(mktemp -d) mountdir=$(mktemp -d)
mount "$loopback" "$mountdir" mount "$loopback" "$mountdir"
if [ $(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1) != "0542054e9ff2d2e0507ea1ffe7d4fc87" ]; then if [ "$(md5sum "$mountdir/etc/rc.local" | cut -d ' ' -f 1)" != "0542054e9ff2d2e0507ea1ffe7d4fc87" ]; then
echo "Creating new /etc/rc.local" echo "Creating new /etc/rc.local"
mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak" mv "$mountdir/etc/rc.local" "$mountdir/etc/rc.local.bak"
#####Do not touch the following lines##### #####Do not touch the following lines#####
@ -290,7 +286,7 @@ if ! minsize=$(resize2fs -P "$loopback"); then
error $LINENO "resize2fs failed with rc $rc" error $LINENO "resize2fs failed with rc $rc"
exit -10 exit -10
fi fi
minsize=$(cut -d ':' -f 2 <<< $minsize | tr -d ' ') minsize=$(cut -d ':' -f 2 <<< "$minsize" | tr -d ' ')
logVariables $LINENO minsize logVariables $LINENO minsize
if [[ $currentsize -eq $minsize ]]; then if [[ $currentsize -eq $minsize ]]; then
error $LINENO "Image already shrunk to smallest size" error $LINENO "Image already shrunk to smallest size"
@ -325,13 +321,13 @@ sleep 1
partnewsize=$(($minsize * $blocksize)) partnewsize=$(($minsize * $blocksize))
newpartend=$(($partstart + $partnewsize)) newpartend=$(($partstart + $partnewsize))
logVariables $LINENO partnewsize newpartend logVariables $LINENO partnewsize newpartend
if ! parted -s -a minimal "$img" rm $partnum; then if ! parted -s -a minimal "$img" rm "$partnum"; then
rc=$? rc=$?
error $LINENO "parted failed with rc $rc" error $LINENO "parted failed with rc $rc"
exit -13 exit -13
fi fi
if ! parted -s "$img" unit B mkpart primary $partstart $newpartend; then if ! parted -s "$img" unit B mkpart primary "$partstart" "$newpartend"; then
rc=$? rc=$?
error $LINENO "parted failed with rc $rc" error $LINENO "parted failed with rc $rc"
exit -14 exit -14
@ -347,7 +343,7 @@ fi
endresult=$(tail -1 <<< "$endresult" | cut -d ':' -f 2 | tr -d 'B') endresult=$(tail -1 <<< "$endresult" | cut -d ':' -f 2 | tr -d 'B')
logVariables $LINENO endresult logVariables $LINENO endresult
if ! truncate -s $endresult "$img"; then if ! truncate -s "$endresult" "$img"; then
rc=$? rc=$?
error $LINENO "trunate failed with rc $rc" error $LINENO "trunate failed with rc $rc"
exit -16 exit -16