diff --git a/modules/akmods/akmods.sh b/modules/akmods/akmods.sh index 47430f3..827e401 100644 --- a/modules/akmods/akmods.sh +++ b/modules/akmods/akmods.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -oue pipefail +set -euo pipefail function ENABLE_MULTIMEDIA_REPO { sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && sed -i "0,/enabled/ s@enabled=0@enabled=1@g" /etc/yum.repos.d/negativo17-fedora-multimedia.repo; diff --git a/modules/bling/bling.sh b/modules/bling/bling.sh index 356ec0f..e90980a 100644 --- a/modules/bling/bling.sh +++ b/modules/bling/bling.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail # Fetch bling COPR REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-${OS_VERSION}/ublue-os-bling-fedora-${OS_VERSION}.repo" diff --git a/modules/bling/installers/container-tools.sh b/modules/bling/installers/container-tools.sh index 5740eef..b68ffeb 100644 --- a/modules/bling/installers/container-tools.sh +++ b/modules/bling/installers/container-tools.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail install -c -m 0755 "$BLING_DIRECTORY/files/usr/bin/docker-compose" "/usr/bin/docker-compose" install -c -m 0755 "$BLING_DIRECTORY/files/usr/bin/kind" "/usr/bin/kind" diff --git a/modules/bling/installers/dconf-update-service.sh b/modules/bling/installers/dconf-update-service.sh index 7ebdc56..0284239 100644 --- a/modules/bling/installers/dconf-update-service.sh +++ b/modules/bling/installers/dconf-update-service.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail cp -r "$BLING_DIRECTORY/files/usr/lib/systemd/system/dconf-update.service" "/usr/lib/systemd/system/dconf-update.service" systemctl enable dconf-update.service diff --git a/modules/bling/installers/devpod.sh b/modules/bling/installers/devpod.sh index 9bb8699..2666705 100644 --- a/modules/bling/installers/devpod.sh +++ b/modules/bling/installers/devpod.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail rpm-ostree install "$BLING_DIRECTORY"/rpms/devpod*.rpm \ No newline at end of file diff --git a/modules/bling/installers/flatpaksync.sh b/modules/bling/installers/flatpaksync.sh index c2b2be4..0568396 100644 --- a/modules/bling/installers/flatpaksync.sh +++ b/modules/bling/installers/flatpaksync.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -oue pipefail +set -euo pipefail SYSTEMD_USER_JOBS_DIR="/usr/lib/systemd/user/" diff --git a/modules/bling/installers/fonts.sh b/modules/bling/installers/fonts.sh index 200563b..91dec16 100644 --- a/modules/bling/installers/fonts.sh +++ b/modules/bling/installers/fonts.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail echo "!!!!! The bling font installer has been deprecated in favor of the fonts module. This error-free message will be removed in a future version. !!!!! " \ No newline at end of file diff --git a/modules/bling/installers/gnome-vrr.sh b/modules/bling/installers/gnome-vrr.sh index 9ed2ddd..9543fca 100644 --- a/modules/bling/installers/gnome-vrr.sh +++ b/modules/bling/installers/gnome-vrr.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail wget -O "/etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo" "https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-${OS_VERSION}/kylegospo-gnome-vrr-fedora-${OS_VERSION}.repo" diff --git a/modules/bling/installers/justfiles.sh b/modules/bling/installers/justfiles.sh index d976305..76ae80a 100644 --- a/modules/bling/installers/justfiles.sh +++ b/modules/bling/installers/justfiles.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail cp -r "$BLING_DIRECTORY"/files/usr/share/ublue-os/just/* "/usr/share/ublue-os/just" \ No newline at end of file diff --git a/modules/bling/installers/laptop.sh b/modules/bling/installers/laptop.sh index 25a8aa2..c23c98c 100644 --- a/modules/bling/installers/laptop.sh +++ b/modules/bling/installers/laptop.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail wget "https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo" \ -O "/etc/yum.repos.d/_copr_ublue-os_staging.repo" diff --git a/modules/bling/installers/nix-installer.sh b/modules/bling/installers/nix-installer.sh index 9f678ac..a730d75 100644 --- a/modules/bling/installers/nix-installer.sh +++ b/modules/bling/installers/nix-installer.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail cp "$BLING_DIRECTORY/files/usr/bin/ublue-nix-install" "/usr/bin/ublue-nix-install" cp "$BLING_DIRECTORY/files/usr/bin/ublue-nix-uninstall" "/usr/bin/ublue-nix-uninstall" \ No newline at end of file diff --git a/modules/bling/installers/ublue-os-wallpapers.sh b/modules/bling/installers/ublue-os-wallpapers.sh index 6598bb7..7fd7fe2 100644 --- a/modules/bling/installers/ublue-os-wallpapers.sh +++ b/modules/bling/installers/ublue-os-wallpapers.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail rpm-ostree install "$BLING_DIRECTORY"/rpms/ublue-os-wallpapers*.rpm \ No newline at end of file diff --git a/modules/bling/installers/ublue-update.sh b/modules/bling/installers/ublue-update.sh index c7e2aa7..3fb0110 100644 --- a/modules/bling/installers/ublue-update.sh +++ b/modules/bling/installers/ublue-update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail get_config_value() { sed -n '/^'"$1"'=/{s/'"$1"'=//;p}' "$2" diff --git a/modules/default-flatpaks/default-flatpaks.sh b/modules/default-flatpaks/default-flatpaks.sh index 2e4b926..b4e8e08 100644 --- a/modules/default-flatpaks/default-flatpaks.sh +++ b/modules/default-flatpaks/default-flatpaks.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail BLING_DIRECTORY="${BLING_DIRECTORY:-"/tmp/bling"}" diff --git a/modules/files/files.sh b/modules/files/files.sh index 8320dbc..51ff107 100644 --- a/modules/files/files.sh +++ b/modules/files/files.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail get_yaml_array FILES '.files[]' "$1" diff --git a/modules/fonts/download.sh b/modules/fonts/download.sh index c80e8ec..d019dc3 100644 --- a/modules/fonts/download.sh +++ b/modules/fonts/download.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -oue pipefail +set -euo pipefail NAME=$1 FORMAT=$2 diff --git a/modules/fonts/fonts.sh b/modules/fonts/fonts.sh index d1516af..13c8d9e 100644 --- a/modules/fonts/fonts.sh +++ b/modules/fonts/fonts.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -oue pipefail +set -euo pipefail export FONTS_MODULE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" diff --git a/modules/fonts/sources/google-fonts.sh b/modules/fonts/sources/google-fonts.sh index 6588c69..4747795 100644 --- a/modules/fonts/sources/google-fonts.sh +++ b/modules/fonts/sources/google-fonts.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -oue pipefail +set -euo pipefail mapfile -t FONTS <<< "$@" URL="https://fonts.google.com/download?family=" diff --git a/modules/fonts/sources/nerd-fonts.sh b/modules/fonts/sources/nerd-fonts.sh index d1bb215..f85409c 100644 --- a/modules/fonts/sources/nerd-fonts.sh +++ b/modules/fonts/sources/nerd-fonts.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -oue pipefail +set -euo pipefail mapfile -t FONTS <<< "$@" URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download/" diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index 1c379ba..00cac1f 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail # Pull in repos get_yaml_array REPOS '.repos[]' "$1" diff --git a/modules/script/README.md b/modules/script/README.md index edc64e1..6afcb68 100644 --- a/modules/script/README.md +++ b/modules/script/README.md @@ -22,5 +22,5 @@ When creating a script, please make sure - `autorun.sh` only executes files that match `*.sh`. - ...it starts with a [shebang]() like `#!/usr/bin/env bash`. - This ensures the script is ran with the correct interpreter / shell. -- ...it contains the command `set -oue pipefail` near the start. +- ...it contains the command `set -euo pipefail` near the start. - This will make the image build fail if your script fails. If you do not care if your script works or not, you can omit this line. diff --git a/modules/script/script.sh b/modules/script/script.sh index fe63e0f..25a894f 100644 --- a/modules/script/script.sh +++ b/modules/script/script.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail get_yaml_array SCRIPTS '.scripts[]' "$1" @@ -13,4 +13,4 @@ find "$PWD" -type f -exec chmod +x {} \; for SCRIPT in "${SCRIPTS[@]}"; do echo "Running script $SCRIPT" eval "$PWD/$SCRIPT" -done \ No newline at end of file +done diff --git a/modules/systemd/systemd.sh b/modules/systemd/systemd.sh index dde8208..1642db9 100644 --- a/modules/systemd/systemd.sh +++ b/modules/systemd/systemd.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail get_yaml_array ENABLED '.system.enabled[]' "$1" get_yaml_array DISABLED '.system.disabled[]' "$1" diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh index 288bbe3..c790d42 100644 --- a/modules/yafti/yafti.sh +++ b/modules/yafti/yafti.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tell build process to exit if there are any errors. -set -oue pipefail +set -euo pipefail FIRSTBOOT_DATA="/usr/share/ublue-os/firstboot" FIRSTBOOT_SCRIPT="${FIRSTBOOT_DATA}/launcher/login-profile.sh"