Compare commits

..

No commits in common. "42e9b6bd7f5a67e8506cee25431ab29f67f1f743" and "cd7b58d4fe9e91d7e00ff04ca19eab56628d209a" have entirely different histories.

2 changed files with 14 additions and 23 deletions

View File

@ -93,7 +93,7 @@ set_device_path(){
OPTIMAL_BLOCKSIZE="4K" OPTIMAL_BLOCKSIZE="4K"
fi fi
info "Optimal blocksize set to: $OPTIMAL_BLOCKSIZE" || error info "Optimal blocksize set to: $OPTIMAL_BLOCKSIZE" || error
}
overwritte_device_with_zeros(){ overwritte_device_with_zeros(){
question "Should $device_path be overwritten with zeros before copying?(y/N)" && read -r copy_zeros_to_device question "Should $device_path be overwritten with zeros before copying?(y/N)" && read -r copy_zeros_to_device

View File

@ -87,7 +87,7 @@ case "$operation_system" in
image_name="manjaro-architect-20.0-200426-linux56.iso" image_name="manjaro-architect-20.0-200426-linux56.iso"
;; ;;
"gnome") "gnome")
question "Which release(e.g.:20,21,raspberrypi) should be used:" && read -r release question "Which release(e.g.:20,21) should be used:" && read -r release
case "$release" in case "$release" in
"20") "20")
image_checksum="2df3697908483550d4a473815b08c1377e6b6892" image_checksum="2df3697908483550d4a473815b08c1377e6b6892"
@ -95,17 +95,9 @@ case "$operation_system" in
image_name="manjaro-gnome-20.0-200426-linux56.iso" image_name="manjaro-gnome-20.0-200426-linux56.iso"
;; ;;
"21") "21")
base_download_url="https://download.manjaro.org/gnome/21.3.7/" image_checksum="78b8fa6a5222bc10a2e767485e76f82f3c7b2b59f4a70501b4a9fb846c5ad94987cf8b8ed630a701a8a3386debc0a39fc7363a743df8f13f41d3d8324d74e227"
image_name="manjaro-gnome-21.3.7-220816-linux515.iso"
;;
"22")
base_download_url="https://download.manjaro.org/gnome/22.1.3/"
image_name="manjaro-gnome-22.1.3-230529-linux61.iso" image_name="manjaro-gnome-22.1.3-230529-linux61.iso"
;; ;;
"raspberrypi")
base_download_url="https://github.com/manjaro-arm/rpi4-images/releases/download/23.02/"
image_name="Manjaro-ARM-gnome-rpi4-23.02.img.xz"
;;
esac esac
;; ;;
esac esac
@ -172,18 +164,17 @@ case "$operation_system" in
;; ;;
esac esac
if [ -z "$image_checksum" ]; then if [ -z "$image_checksum" ]
for ext in sha1 sha512; do then
sha_download_url="$download_url.$ext" sha1_download_url="$download_url.sha1"
info "Image Checksum is not defined. Try to download image signature from $sha_download_url." info "Image Chechsum is not defined. Try to download image signature from $sha1_download_url."
if wget -q --method=HEAD "$sha_download_url"; then if wget -q --method=HEAD "$sha1_download_url";
image_checksum="$(wget $sha_download_url -q -O - | cut -d ' ' -f1)" then
image_checksum="$(wget $sha1_download_url -q -O - | cut -d ' ' -f1 )"
info "Defined image_checksum as $image_checksum" info "Defined image_checksum as $image_checksum"
break
else else
warning "No checksum found under $sha_download_url." warning "No checksum found under $sha1_download_url."
fi fi
done
fi fi
info "Verifying image..." info "Verifying image..."