Merge pull request #120 from saveriomiroddi/build_related_improvements
Build-related improvements
This commit is contained in:
commit
3b1a8cd3a9
|
@ -1,3 +1,4 @@
|
|||
---
|
||||
dist: bionic
|
||||
language: bash
|
||||
cache:
|
||||
|
@ -10,4 +11,4 @@ script:
|
|||
> /dev/null || true"
|
||||
- sudo chmod +x /opt/shellcheck/shellcheck
|
||||
- "/opt/shellcheck/shellcheck --version"
|
||||
- "/opt/shellcheck/shellcheck install-zfs.sh"
|
||||
- "/opt/shellcheck/shellcheck $(grep -lzP '^#!/bin/\\w+sh' -r .)"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
source_dir=$(readlink -f $(dirname "$0"))
|
||||
source_dir=$(readlink -f "$(dirname "$0")")
|
||||
demo_dir=$(dirname "$source_dir")
|
||||
|
||||
(for f in "$source_dir"/*.webm; do echo "file '$f'"; done) | ffmpeg -f concat -safe 0 -i /dev/stdin -vf "fps=2,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse" "$demo_dir/demo.gif" -y
|
||||
|
|
|
@ -935,6 +935,8 @@ function create_pools {
|
|||
#
|
||||
# Stdin is ignored if the encryption is not set (and set via prompt).
|
||||
#
|
||||
# shellcheck disable=SC2086 # quoting $v_pools_raid_type; barring invalid user input, the values are guaranteed not to
|
||||
# need quoting.
|
||||
zpool create \
|
||||
"${encryption_options[@]}" \
|
||||
"${v_rpool_tweaks[@]}" \
|
||||
|
@ -944,6 +946,7 @@ function create_pools {
|
|||
|
||||
# `-d` disable all the pool features (not used here);
|
||||
#
|
||||
# shellcheck disable=SC2086 # see above
|
||||
zpool create \
|
||||
"${v_bpool_tweaks[@]}" \
|
||||
-O devices=off -O mountpoint=/boot -R "$c_zfs_mount_dir" -f \
|
||||
|
|
Loading…
Reference in New Issue