buildlib.sh: Reduce verbosity of download_raspbian

This commit is contained in:
thecalcaholic 2022-08-14 23:06:03 +02:00
parent 939a373654
commit 82e47e52e3
3 changed files with 8 additions and 5 deletions

View File

@ -46,7 +46,7 @@ jobs:
run: |
set -x
export LIB_TAG=master
IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
[[ "${{ github.ref_protected }}" == true ]] || export DBG=x
./build/build-SD-armbian.sh "${{ inputs.board_id }}" "${{ inputs.board_name }}"
@ -65,7 +65,7 @@ jobs:
rm -rf armbian/ tmp/ output/
export LIB_TAG=master
IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
[[ "${{ github.ref_protected }}" == true ]] || export DBG=x
./build/build-SD-armbian.sh "${{ inputs.board_id }}" "${{ inputs.board_name }}"
@ -80,7 +80,8 @@ jobs:
id: build-rpi
run: |
set -e
IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
echo "Protected? ${{ github.ref_protected }}"
export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
wget -q https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-aarch64-static -O ./qemu-aarch64-static
[[ "${{ github.ref_protected }}" == true ]] || export DBG=x
./build/build-SD-rpi.sh

View File

@ -8,7 +8,7 @@
# Usage: ./batch.sh <DHCP QEMU image IP>
#
set -e
set -e"$DBG"
source build/buildlib.sh
echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
@ -16,8 +16,10 @@ echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64-lite.zip"
SIZE=4G # Raspbian image size
#CLEAN=0 # Pass this envvar to skip cleaning download cache
set -x
IMG="${IMG:-NextCloudPi_RPi_$( date "+%m-%d-%y" ).img}"
TAR=output/"$( basename "$IMG" .img ).tar.bz2"
[[ "$DBG" == 'x' ]] || set -x
##############################################################################

View File

@ -291,7 +291,7 @@ function download_raspbian()
test -f "$ZIP_CACHE" && {
echo -e "INFO: $ZIP_CACHE already exists. Skipping download ..."
} || {
wget "$URL" -O "$ZIP_CACHE" || return 1
wget "$URL" -nv -O "$ZIP_CACHE" || return 1
}
unzip -o "$ZIP_CACHE" && \