Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improvements to writeimage.sh #2980

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

improvements to writeimage.sh #2980

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions writeimage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ if [ -z "$1" ]; then
usage 1>&2
fi

if [[ $(id -u) -ne 0 ]]; then echo "please run as root"; exit 1; fi

function msg() {
echo " * $1"
}
Expand Down Expand Up @@ -78,31 +76,43 @@ if ! [ -f "$DISK_IMG" ]; then
exit 1
fi

gunzip=$(which unpigz 2> /dev/null || which gunzip 2> /dev/null || true)
unxz=$(which unxz 2> /dev/null || true)
if [[ $(id -u) -ne 0 ]]; then echo "please run as root"; exit 1; fi

gzip=$(which pigz 2>/dev/null || which gzip 2>/dev/null || true)
xz=$(which xz 2>/dev/null || true)
pv=$(which pv 2>/dev/null || true)
ddopts="status=none"
if [ -z "$pv" ]; then
pv=cat
ddopts="status=progress"
fi

extractor=""
extractopts=(-d -c)
if [[ $DISK_IMG == *.gz ]]; then
if [ -z "$gunzip" ]; then
if [ -z "$gzip" ]; then
msg "make sure you have the gzip package installed"
exit 1
fi
msg "decompressing the .gz compressed image"
$gunzip -c "$DISK_IMG" > "${DISK_IMG%???}"
DISK_IMG=${DISK_IMG%???}
extractor=$gzip
elif [[ $DISK_IMG == *.xz ]]; then
if [ -z "$unxz" ]; then
if [ -z "$xz" ]; then
msg "make sure you have the xz package installed"
exit 1
fi
msg "decompressing the .xz compressed image"
$unxz -T 0 -c "$DISK_IMG" > "${DISK_IMG%???}"
DISK_IMG=${DISK_IMG%???}
extractor=$xz
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note that according to the xz man page -T 0 isn't implemented for decompression, but if it were you could addextractopts=(-d -c -T 0) here to support that.

fi

if [ -z "$extractor" ]; then
msg "Could not determine archive type!"
exit 1
fi

umount "${SDCARD_DEV}"* 2>/dev/null || true
msg "writing disk image to sdcard"
dd if="$DISK_IMG" of="$SDCARD_DEV" bs=1048576
sync
msg "extracting disk image to sdcard"
do_extract=("$extractor" ${extractopts[@]})
$pv "$DISK_IMG" | "${do_extract[@]}" | dd of="$SDCARD_DEV" bs=4M iflag=fullblock oflag=direct,sync $ddopts
#sync

if which partprobe > /dev/null 2>&1; then
msg "re-reading sdcard partition table"
Expand Down