diff --git a/openwrtbuilder b/openwrtbuilder index 1981a35..331e7a9 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -81,15 +81,15 @@ init() { raspbian) ID="debian" ;; *) echo "Autodetecting distro, this may be unreliable" - if hash dnf &>/dev/null; then + if command -v dnf &>/dev/null; then ID="fedora" RPM_MGR="dnf" - elif hash yum &>/dev/null; then + elif command -v yum &>/dev/null; then ID="centos" RPM_MGR="yum" - elif hash apt &>/dev/null; then + elif command -v apt &>/dev/null; then ID="ubuntu" - elif hash pacman &>/dev/null; then + elif command -v pacman &>/dev/null; then ID="arch" else return 1 @@ -425,7 +425,7 @@ flash_images() { if execute sudo dd if="$img" of="$dev" bs=2M conv=fsync; then sync - echo "Image flashed sucessfully!" + echo "Image flashed successfully!" else echo "dd failed!" return 1 @@ -622,7 +622,7 @@ verify() { local sumfile="$2" local checksum - hash sha256sum &>/dev/null || return 1 + command -v sha256sum &>/dev/null || return 1 [[ -f $sumfile && -f $file_to_check ]] || return 1 checksum=$(grep "${file_to_check##*/}" "$sumfile" | cut -f1 -d' ') echo -n "$checksum $file_to_check" | sha256sum --check --status diff --git a/profiles b/profiles index 96572ca..a24b6b3 100644 --- a/profiles +++ b/profiles @@ -46,12 +46,13 @@ r4s['packages']="\ curl \ ethtool \ ca-bundle" -# The following are source mode only +# The following only work in --source mode r4s['config']="\ CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \ CONFIG_BTRFS_PROGS_ZSTD=y \ CONFIG_TARGET_ROOTFS_PARTSIZE=512 \ - CONFIG_TARGET_KERNEL_PARTSIZE=32" + CONFIG_TARGET_KERNEL_PARTSIZE=32 \ + CONFIG_BUILDBOT=n" r4s['files']="\ /mnt/backup"