rei-forks
/
zfs-installer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #120 from saveriomiroddi/build_related_improvements 

Build-related improvements
This commit is contained in:
Saverio Miroddi 2020-05-05 23:29:54 +02:00 committed by GitHub
parent f64ae4043b a490166ada
commit 3b1a8cd3a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,3 +1,4 @@
---
dist: bionic dist: bionic
language: bash language: bash
cache: cache:
@ -10,4 +11,4 @@ script:
> /dev/null || true" > /dev/null || true"
- sudo chmod +x /opt/shellcheck/shellcheck - sudo chmod +x /opt/shellcheck/shellcheck
- "/opt/shellcheck/shellcheck --version" - "/opt/shellcheck/shellcheck --version"
- "/opt/shellcheck/shellcheck install-zfs.sh" - "/opt/shellcheck/shellcheck $(grep -lzP '^#!/bin/\\w+sh' -r .)"

2
demo/source/convert.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
source_dir=$(readlink -f $(dirname "$0")) source_dir=$(readlink -f "$(dirname "$0")")
demo_dir=$(dirname "$source_dir") 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 (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

3
install-zfs.sh
View File

@ -935,6 +935,8 @@ function create_pools {
# #
# Stdin is ignored if the encryption is not set (and set via prompt). # 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 \ zpool create \
"${encryption_options[@]}" \ "${encryption_options[@]}" \
"${v_rpool_tweaks[@]}" \ "${v_rpool_tweaks[@]}" \
@ -944,6 +946,7 @@ function create_pools {
# `-d` disable all the pool features (not used here); # `-d` disable all the pool features (not used here);
# #
# shellcheck disable=SC2086 # see above
zpool create \ zpool create \
"${v_bpool_tweaks[@]}" \ "${v_bpool_tweaks[@]}" \
-O devices=off -O mountpoint=/boot -R "$c_zfs_mount_dir" -f \ -O devices=off -O mountpoint=/boot -R "$c_zfs_mount_dir" -f \