From 484ee5b57a92ad75608bba6c42e7630f905e5888 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Mon, 9 Sep 2024 22:01:32 +0200 Subject: [PATCH 01/17] fix(yafti): Libadwaita isn't pulled as required dependency RPM spec doesn't list it for some reason, so it needs to be included manually. Fixes the issue for the affected non-Gnome users. --- modules/yafti/yafti.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh index 51d3252..146ecc7 100644 --- a/modules/yafti/yafti.sh +++ b/modules/yafti/yafti.sh @@ -28,7 +28,7 @@ fi wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/" -rpm-ostree install yafti +rpm-ostree install libadwaita yafti # Remove ublue COPR rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo From cfe7dcdc8c65395e07c44af8f7136096efcbb99f Mon Sep 17 00:00:00 2001 From: Lenus Walker Date: Sat, 14 Sep 2024 11:35:54 -0400 Subject: [PATCH 02/17] fix(gnome-extensions): Fix workaround for PaperWM --- modules/gnome-extensions/gnome-extensions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gnome-extensions/gnome-extensions.sh b/modules/gnome-extensions/gnome-extensions.sh index 99e4bb1..e5c4eb3 100644 --- a/modules/gnome-extensions/gnome-extensions.sh +++ b/modules/gnome-extensions/gnome-extensions.sh @@ -98,8 +98,8 @@ if [[ ${#INSTALL[@]} -gt 0 ]]; then # Error code example: # GLib.FileError: Failed to open file “/usr/share/gnome-shell/extensions/flypie@schneegans.github.com/schemas/gschemas.compiled”: open() failed: No such file or directory # If any extension produces this error, it can be added in if statement below to solve the problem - # Fly-Pie - if [[ "${UUID}" == "flypie@schneegans.github.com" ]]; then + # Fly-Pie or PaperWM + if [[ "${UUID}" == "flypie@schneegans.github.com" || "${UUID}" == "paperwm@paperwm.github.com" ]]; then install -d -m 0755 "/usr/share/gnome-shell/extensions/${UUID}/schemas/" install -D -p -m 0644 "${TMP_DIR}/schemas/"*.gschema.xml "/usr/share/gnome-shell/extensions/${UUID}/schemas/" glib-compile-schemas "/usr/share/gnome-shell/extensions/${UUID}/schemas/" &>/dev/null @@ -202,8 +202,8 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then # Error code example: # GLib.FileError: Failed to open file “/usr/share/gnome-shell/extensions/flypie@schneegans.github.com/schemas/gschemas.compiled”: open() failed: No such file or directory # If any extension produces this error, it can be added in if statement below to solve the problem - # Fly-Pie - if [[ "${EXT_UUID}" == "flypie@schneegans.github.com" ]]; then + # Fly-Pie or PaperWM + if [[ "${EXT_UUID}" == "flypie@schneegans.github.com" || "${EXT_UUID}" == "paperwm@paperwm.github.com" ]]; then install -d -m 0755 "/usr/share/gnome-shell/extensions/${EXT_UUID}/schemas/" install -D -p -m 0644 "${TMP_DIR}/schemas/"*.gschema.xml "/usr/share/gnome-shell/extensions/${EXT_UUID}/schemas/" glib-compile-schemas "/usr/share/gnome-shell/extensions/${EXT_UUID}/schemas/" &>/dev/null From 54d27a1f9d3ff61542bec526a0c183dbfc7a0bec Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Tue, 17 Sep 2024 09:10:15 +0200 Subject: [PATCH 03/17] fix(default-flatpaks): Default notify value not properly set Fixes: https://github.com/blue-build/modules/issues/268 --- modules/default-flatpaks/README.md | 2 +- modules/default-flatpaks/v1/default-flatpaks.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/default-flatpaks/README.md b/modules/default-flatpaks/README.md index 67de6e0..bf19163 100644 --- a/modules/default-flatpaks/README.md +++ b/modules/default-flatpaks/README.md @@ -18,7 +18,7 @@ The scripts are run on every boot by these services: This module stores the Flatpak remote configuration and Flatpak install/remove lists in `/usr/share/bluebuild/default-flatpaks/`. There are two subdirectories, `user` and `system` corresponding with the install level of the Flatpaks and repositories. Each directory has text files containing the IDs of flatpaks to `install` and `remove`, plus a `repo-info.yml` containing the details of the Flatpak repository. -This module also supports disabling & enabling notifications. +This module also supports disabling & enabling notifications. If not specified in the recipe, notifications are disabled by default. ## Local modification diff --git a/modules/default-flatpaks/v1/default-flatpaks.sh b/modules/default-flatpaks/v1/default-flatpaks.sh index b1ca239..7483db8 100644 --- a/modules/default-flatpaks/v1/default-flatpaks.sh +++ b/modules/default-flatpaks/v1/default-flatpaks.sh @@ -180,8 +180,12 @@ check_flatpak_id_validity_from_flathub "${1}" "user" echo "Configuring default-flatpaks notifications" NOTIFICATIONS=$(echo "$1" | yq -I=0 ".notify") CONFIG_NOTIFICATIONS="/usr/share/bluebuild/default-flatpaks/notifications" -cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/notifications "$CONFIG_NOTIFICATIONS" -echo "$NOTIFICATIONS" >> "$CONFIG_NOTIFICATIONS" +cp -r "${MODULE_DIRECTORY}/default-flatpaks/config/notifications" "${CONFIG_NOTIFICATIONS}" +if [[ -z "${NOTIFICATIONS}" ]] || [[ "${NOTIFICATIONS}" == "null" ]]; then + echo "false" >> "${CONFIG_NOTIFICATIONS}" +else + echo "${NOTIFICATIONS}" >> "${CONFIG_NOTIFICATIONS}" +fi echo "Copying user modification template files" From 223fc08759bfef0df602268821809e80c723a7c2 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Tue, 17 Sep 2024 09:20:13 +0200 Subject: [PATCH 04/17] chore(signing): Change cosign key path from `/usr/etc/` to `/etc/` Fixes #273 --- modules/signing/signing.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/signing/signing.sh b/modules/signing/signing.sh index fb7132d..47592ae 100644 --- a/modules/signing/signing.sh +++ b/modules/signing/signing.sh @@ -38,7 +38,7 @@ yq -i -o=j '.transports.docker |= {"'"$IMAGE_REGISTRY"'/'"$IMAGE_NAME"'": [ { "type": "sigstoreSigned", - "keyPath": "/usr/etc/pki/containers/'"$IMAGE_NAME_FILE"'.pub", + "keyPath": "/etc/pki/containers/'"$IMAGE_NAME_FILE"'.pub", "signedIdentity": { "type": "matchRepository" } From cb0c3bde8bd59bb5cd0169a00a103e050974212d Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:56:58 +0200 Subject: [PATCH 05/17] chore(fonts): Force clean then regenerate font cache Should fix some corner cases where font is not applied. Fixes: #213 --- modules/fonts/sources/google-fonts.sh | 4 ++-- modules/fonts/sources/nerd-fonts.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/fonts/sources/google-fonts.sh b/modules/fonts/sources/google-fonts.sh index c16235b..eecb74d 100644 --- a/modules/fonts/sources/google-fonts.sh +++ b/modules/fonts/sources/google-fonts.sh @@ -8,7 +8,7 @@ echo "Installation of google-fonts started" rm -rf "${DEST}" for FONT in "${FONTS[@]}"; do - if [ -n "$FONT" ]; then + if [ -n "${FONT}" ]; then FONT="${FONT#"${FONT%%[![:space:]]*}"}" # Trim leading whitespace FONT="${FONT%"${FONT##*[![:space:]]}"}" # Trim trailing whitespace mkdir -p "${DEST}/${FONT}" @@ -43,4 +43,4 @@ for FONT in "${FONTS[@]}"; do fi done -fc-cache -f "${DEST}" +fc-cache --system-only --really-force "${DEST}" diff --git a/modules/fonts/sources/nerd-fonts.sh b/modules/fonts/sources/nerd-fonts.sh index a641fd2..237872f 100644 --- a/modules/fonts/sources/nerd-fonts.sh +++ b/modules/fonts/sources/nerd-fonts.sh @@ -6,7 +6,7 @@ URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download" DEST="/usr/share/fonts/nerd-fonts" echo "Installation of nerd-fonts started" -rm -rf "$DEST" +rm -rf "${DEST}" mkdir -p /tmp/fonts for FONT in "${FONTS[@]}"; do @@ -22,4 +22,4 @@ for FONT in "${FONTS[@]}"; do done rm -rf /tmp/fonts -fc-cache -f "${DEST}" \ No newline at end of file +fc-cache --system-only --really-force "${DEST}" From 12135f7c9c2826fe8250f2bda96b60cab56a0e07 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Mon, 16 Sep 2024 21:32:03 -0400 Subject: [PATCH 06/17] fix: Set curl to silent and fail --- modules/brew/brew.sh | 11 +++++++---- modules/chezmoi/chezmoi.sh | 3 ++- modules/fonts/sources/google-fonts.sh | 5 +++-- modules/fonts/sources/nerd-fonts.sh | 5 +++-- modules/gnome-extensions/gnome-extensions.sh | 8 ++++---- modules/rpm-ostree/rpm-ostree.sh | 20 ++++++++++++++++---- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/modules/brew/brew.sh b/modules/brew/brew.sh index a10402d..9ccb958 100644 --- a/modules/brew/brew.sh +++ b/modules/brew/brew.sh @@ -75,7 +75,8 @@ touch /.dockerenv # Always install Brew echo "Downloading and installing Brew..." -curl -Lo /tmp/brew-install https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh +curl -sfLo /tmp/brew-install https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh +echo "Downloaded Brew install script" chmod +x /tmp/brew-install /tmp/brew-install @@ -193,8 +194,10 @@ if [[ ! -d "/etc/profile.d/" ]]; then fi if [[ ! -f "/etc/profile.d/brew.sh" ]]; then echo "Apply brew path export fix, to solve path conflicts between system & brew programs with same name" - echo "#!/usr/bin/env bash -[[ -d /home/linuxbrew/.linuxbrew && $- == *i* ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"" > "/etc/profile.d/brew.sh" + cat > /etc/profile.d/brew.sh </dev/null); then @@ -31,7 +31,8 @@ for FONT in "${FONTS[@]}"; do if FILENAME=$(echo "${FILE_REF}" | jq -er '.filename' 2>/dev/null); then if URL=$(echo "${FILE_REF}" | jq -er '.url' 2>/dev/null); then echo "Downloading ${FILENAME} from ${URL}" - curl "${URL}" -o "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename + curl "${URL}" -sfo "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename + echo "Downloaded ${FILENAME}" else echo "Failed to extract URLs for: ${FONT}" >&2 fi diff --git a/modules/fonts/sources/nerd-fonts.sh b/modules/fonts/sources/nerd-fonts.sh index 237872f..c5550b8 100644 --- a/modules/fonts/sources/nerd-fonts.sh +++ b/modules/fonts/sources/nerd-fonts.sh @@ -15,8 +15,9 @@ for FONT in "${FONTS[@]}"; do mkdir -p "${DEST}/${FONT}" echo "Downloading ${FONT} from ${URL}/${FONT}.tar.xz" - - curl "${URL}/${FONT}.tar.xz" -L -o "/tmp/fonts/${FONT}.tar.xz" + curl "${URL}/${FONT}.tar.xz" -sfL -o "/tmp/fonts/${FONT}.tar.xz" + echo "Downloaded ${FONT}" + tar -xf "/tmp/fonts/${FONT}.tar.xz" -C "${DEST}/${FONT}" fi done diff --git a/modules/gnome-extensions/gnome-extensions.sh b/modules/gnome-extensions/gnome-extensions.sh index e5c4eb3..880efb2 100644 --- a/modules/gnome-extensions/gnome-extensions.sh +++ b/modules/gnome-extensions/gnome-extensions.sh @@ -133,7 +133,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then # Literal-name extension config # Replaces whitespaces with %20 for install entries which contain extension name, since URLs can't contain whitespace WHITESPACE_HTML="${INSTALL_EXT// /%20}" - URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}") + URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}") QUERIED_EXT=$(echo "${URL_QUERY}" | jq ".extensions[] | select(.name == \"${INSTALL_EXT}\")") if [[ -z "${QUERIED_EXT}" ]] || [[ "${QUERIED_EXT}" == "null" ]]; then echo "ERROR: Extension '${INSTALL_EXT}' does not exist in https://extensions.gnome.org/ website" @@ -158,7 +158,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then fi else # PK ID extension config fallback if specified - URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-info/?pk=${INSTALL_EXT}") + URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-info/?pk=${INSTALL_EXT}") PK_EXT=$(echo "${URL_QUERY}" | jq -r '.["pk"]' 2>/dev/null) if [[ -z "${PK_EXT}" ]] || [[ "${PK_EXT}" == "null" ]]; then echo "ERROR: Extension with PK ID '${INSTALL_EXT}' does not exist in https://extensions.gnome.org/ website" @@ -237,7 +237,7 @@ if [[ ${#UNINSTALL[@]} -gt 0 ]]; then # Replaces whitespaces with %20 for install entries which contain extension name, since URLs can't contain whitespace # Getting json query from the website is useful to intuitively uninstall the extension without need to manually input UUID WHITESPACE_HTML="${UNINSTALL_EXT// /%20}" - URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}") + URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}") QUERIED_EXT=$(echo "${URL_QUERY}" | jq ".extensions[] | select(.name == \"${UNINSTALL_EXT}\")") if [[ -z "${QUERIED_EXT}" ]] || [[ "${QUERIED_EXT}" == "null" ]]; then echo "ERROR: Extension '${UNINSTALL_EXT}' does not exist in https://extensions.gnome.org/ website" @@ -249,7 +249,7 @@ if [[ ${#UNINSTALL[@]} -gt 0 ]]; then EXT_NAME=$(echo "${QUERIED_EXT}" | jq -r '.["name"]') else # PK ID extension config fallback if specified - URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-info/?pk=${UNINSTALL_EXT}") + URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-info/?pk=${UNINSTALL_EXT}") PK_EXT=$(echo "${URL_QUERY}" | jq -r '.["pk"]' 2>/dev/null) if [[ -z "${PK_EXT}" ]] || [[ "${PK_EXT}" == "null" ]]; then echo "ERROR: Extension with PK ID '${UNINSTALL_EXT}' does not exist in https://extensions.gnome.org/ website" diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index 4f91210..23c5981 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -12,10 +12,17 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then # If it's the COPR repo, then download the repo normally # If it's not, then download the repo with URL in it's filename, to avoid duplicate repo name issue if [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == "https://copr.fedorainfracloud.org/coprs/"* ]]; then - curl --output-dir "/etc/yum.repos.d/" -O "${REPO//[$'\t\r\n ']}" + REPO_URL="${REPO//[$'\t\r\n ']}" + + echo "Downloading repo file ${REPO_URL}" + curl -fs --output-dir "/etc/yum.repos.d/" -O "${REPO_URL}" + echo "Downloaded repo file ${REPO_URL}" elif [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" != "https://copr.fedorainfracloud.org/coprs/"* ]]; then CLEAN_REPO_NAME=$(echo "${REPO}" | sed 's/^https\?:\/\///') - curl -o "/etc/yum.repos.d/${CLEAN_REPO_NAME//\//.}" "${REPO//[$'\t\r\n ']}" + + echo "Downloading repo file ${CLEAN_REPO_NAME}" + curl -fs -o "/etc/yum.repos.d/${CLEAN_REPO_NAME//\//.}" "${REPO//[$'\t\r\n ']}" + echo "Downloaded repo file ${CLEAN_REPO_NAME}" elif [[ ! "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == *".repo" ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" ]]; then cp "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" "/etc/yum.repos.d/${REPO##*/}" fi @@ -158,8 +165,13 @@ if [[ ${#REPLACE[@]} -gt 0 ]]; then echo "Replacing packages from COPR repository: '${REPO_NAME}' owned by '${MAINTAINER}'" echo "Replacing: ${REPLACE_STR}" - curl --output-dir "/etc/yum.repos.d/" -O "${REPO//[$'\t\r\n ']}" - rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME} ${REPLACE_STR} + REPO_URL="${REPO//[$'\t\r\n ']}" + + echo "Downloading repo file ${REPO_URL}" + curl -fs --output-dir "/etc/yum.repos.d/" -O "${REPO_URL}" + echo "Downloaded repo file ${REPO_URL}" + + rpm-ostree override replace --experimental --from "repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME}" "${REPLACE_STR}" rm "/etc/yum.repos.d/${FILE_NAME}" done From 53cb2982e05fd800f240860922037f0dedd45161 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:25:35 +0200 Subject: [PATCH 07/17] fix: Brew profile.d script writing Unrelated to this PR, but good to fix --- modules/brew/brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/brew/brew.sh b/modules/brew/brew.sh index 9ccb958..06fbc23 100644 --- a/modules/brew/brew.sh +++ b/modules/brew/brew.sh @@ -196,7 +196,7 @@ if [[ ! -f "/etc/profile.d/brew.sh" ]]; then echo "Apply brew path export fix, to solve path conflicts between system & brew programs with same name" cat > /etc/profile.d/brew.sh < Date: Wed, 18 Sep 2024 08:43:58 +0200 Subject: [PATCH 08/17] chore(rpm-ostree): Use link for the URL instead of repo name for non-copr repo --- modules/rpm-ostree/rpm-ostree.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index 23c5981..d0d230c 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -20,9 +20,9 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then elif [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" != "https://copr.fedorainfracloud.org/coprs/"* ]]; then CLEAN_REPO_NAME=$(echo "${REPO}" | sed 's/^https\?:\/\///') - echo "Downloading repo file ${CLEAN_REPO_NAME}" + echo "Downloading repo file ${REPO}" curl -fs -o "/etc/yum.repos.d/${CLEAN_REPO_NAME//\//.}" "${REPO//[$'\t\r\n ']}" - echo "Downloaded repo file ${CLEAN_REPO_NAME}" + echo "Downloaded repo file ${REPO}" elif [[ ! "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == *".repo" ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" ]]; then cp "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" "/etc/yum.repos.d/${REPO##*/}" fi From e4279ce0a3dd066312390a455bf12d4b8092cbb0 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:48:23 +0200 Subject: [PATCH 09/17] chore(rpm-ostree): Some style fixes for the previous commit --- modules/rpm-ostree/rpm-ostree.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index d0d230c..ac0e941 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -18,11 +18,13 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then curl -fs --output-dir "/etc/yum.repos.d/" -O "${REPO_URL}" echo "Downloaded repo file ${REPO_URL}" elif [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" != "https://copr.fedorainfracloud.org/coprs/"* ]]; then - CLEAN_REPO_NAME=$(echo "${REPO}" | sed 's/^https\?:\/\///') - - echo "Downloading repo file ${REPO}" - curl -fs -o "/etc/yum.repos.d/${CLEAN_REPO_NAME//\//.}" "${REPO//[$'\t\r\n ']}" - echo "Downloaded repo file ${REPO}" + REPO_URL="${REPO//[$'\t\r\n ']}" + CLEAN_REPO_NAME=$(echo "${REPO_URL}" | sed 's/^https\?:\/\///') + CLEAN_REPO_NAME=$(echo "${CLEAN_REPO_NAME//\//.}") + + echo "Downloading repo file ${REPO_URL}" + curl -fs -o "/etc/yum.repos.d/${CLEAN_REPO_NAME}" "${REPO_URL}" + echo "Downloaded repo file ${REPO_URL}" elif [[ ! "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == *".repo" ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" ]]; then cp "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" "/etc/yum.repos.d/${REPO##*/}" fi From fe861fd2d0ded0135faeeb2854e25ddcc6fca9b4 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:57:25 +0200 Subject: [PATCH 10/17] chore(rpm-ostree): Fix useless echo --- modules/rpm-ostree/rpm-ostree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index ac0e941..dcd49e9 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -20,7 +20,7 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then elif [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" != "https://copr.fedorainfracloud.org/coprs/"* ]]; then REPO_URL="${REPO//[$'\t\r\n ']}" CLEAN_REPO_NAME=$(echo "${REPO_URL}" | sed 's/^https\?:\/\///') - CLEAN_REPO_NAME=$(echo "${CLEAN_REPO_NAME//\//.}") + CLEAN_REPO_NAME="${CLEAN_REPO_NAME//\//.}" echo "Downloading repo file ${REPO_URL}" curl -fs -o "/etc/yum.repos.d/${CLEAN_REPO_NAME}" "${REPO_URL}" From 7112d80598eea5627b0240f489f8fc7bbda2513f Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:31:35 +0200 Subject: [PATCH 11/17] chore: Switch from `wget` to `curl` --- modules/bling/installers/gnome-vrr.sh | 6 +++++- modules/bling/installers/ublue-update.sh | 6 ++++-- modules/gnome-extensions/gnome-extensions.sh | 8 ++++++-- modules/yafti/yafti.sh | 5 ++++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/bling/installers/gnome-vrr.sh b/modules/bling/installers/gnome-vrr.sh index d89ab6b..5ea19b5 100644 --- a/modules/bling/installers/gnome-vrr.sh +++ b/modules/bling/installers/gnome-vrr.sh @@ -9,7 +9,11 @@ if [[ $(gnome-shell --version) =~ "46" ]]; then exit 1 fi -wget -O "/etc/yum.repos.d/ublue-os-staging.repo" "https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" +REP_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" + +echo "Downloading repo file ${REPO_URL}" +curl -fs -o "/etc/yum.repos.d/ublue-os-staging.repo" "${REPO_URL}" +echo "Downloaded repo file ${REPO_URL}" rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland diff --git a/modules/bling/installers/ublue-update.sh b/modules/bling/installers/ublue-update.sh index f5202c9..6b8ae20 100644 --- a/modules/bling/installers/ublue-update.sh +++ b/modules/bling/installers/ublue-update.sh @@ -28,8 +28,10 @@ fi systemctl disable rpm-ostreed-automatic.timer # Fetch ublue COPR -REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" -wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}" +REPO_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" +echo "Downloading repo file ${REPO_URL}" +curl -fs -o "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO_URL}" +echo "Downloaded repo file ${REPO_URL}" # topgrade is REQUIRED by ublue-update to install rpm-ostree install topgrade diff --git a/modules/gnome-extensions/gnome-extensions.sh b/modules/gnome-extensions/gnome-extensions.sh index 880efb2..ef6b35f 100644 --- a/modules/gnome-extensions/gnome-extensions.sh +++ b/modules/gnome-extensions/gnome-extensions.sh @@ -55,7 +55,9 @@ if [[ ${#INSTALL[@]} -gt 0 ]]; then VERSION=$(echo "${EXTENSION}" | grep -oP 'v\d+') echo "Installing ${EXTENSION} Gnome extension with version ${VERSION}" # Download archive - wget --directory-prefix="${TMP_DIR}" "${URL}" + echo "Downloading ZIP archive ${URL}" + curl -fs -o "${ARCHIVE_DIR}" "${URL}" + echo "Downloaded ZIP archive ${URL}" # Extract archive echo "Extracting ZIP archive" unzip "${ARCHIVE_DIR}" -d "${TMP_DIR}" > /dev/null @@ -182,7 +184,9 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then ARCHIVE_DIR="${TMP_DIR}/${ARCHIVE}" echo "Installing '${EXT_NAME}' Gnome extension with version ${SUITABLE_VERSION}" # Download archive - wget --directory-prefix="${TMP_DIR}" "${URL}" + echo "Downloading ZIP archive ${URL}" + curl -fs -o "${ARCHIVE_DIR}" "${URL}" + echo "Downloaded ZIP archive ${URL}" # Extract archive echo "Extracting ZIP archive" unzip "${ARCHIVE_DIR}" -d "${TMP_DIR}" > /dev/null diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh index 146ecc7..b6194a8 100644 --- a/modules/yafti/yafti.sh +++ b/modules/yafti/yafti.sh @@ -19,6 +19,7 @@ FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh" # Fetch ublue COPR REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" +REPO_URL="${REPO//[$'\t\r\n ']}" STAGING_REPO_PATH="/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" BACKUP_STAGING_REPO_PATH="${STAGING_REPO_PATH}.backup" @@ -26,7 +27,9 @@ if [ -f "$STAGING_REPO_PATH" ]; then mv "$STAGING_REPO_PATH" "$BACKUP_STAGING_REPO_PATH" fi -wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/" +echo "Downloading repo file ${REPO_URL}" +curl -fs -o "${STAGING_REPO_PATH}" "${REPO_URL}" +echo "Downloaded repo file ${REPO_URL}" rpm-ostree install libadwaita yafti From a31cc10aebf7fe11595b6b12268c7a044ef2ee96 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:33:59 +0200 Subject: [PATCH 12/17] fix: Typo for variable in gnome-vrr --- modules/bling/installers/gnome-vrr.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/bling/installers/gnome-vrr.sh b/modules/bling/installers/gnome-vrr.sh index 5ea19b5..391f723 100644 --- a/modules/bling/installers/gnome-vrr.sh +++ b/modules/bling/installers/gnome-vrr.sh @@ -9,7 +9,7 @@ if [[ $(gnome-shell --version) =~ "46" ]]; then exit 1 fi -REP_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" +REPO_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" echo "Downloading repo file ${REPO_URL}" curl -fs -o "/etc/yum.repos.d/ublue-os-staging.repo" "${REPO_URL}" @@ -17,4 +17,4 @@ echo "Downloaded repo file ${REPO_URL}" rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland -rm -f /etc/yum.repos.d/ublue-os-staging.repo \ No newline at end of file +rm -f /etc/yum.repos.d/ublue-os-staging.repo From 8f9255cacd07735c900039c86a87cb95022ce38a Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:10:52 +0200 Subject: [PATCH 13/17] chore: Make `curl` commands clearer & more standardized --- modules/brew/brew.sh | 2 +- modules/chezmoi/chezmoi.sh | 2 +- modules/fonts/sources/google-fonts.sh | 2 +- modules/fonts/sources/nerd-fonts.sh | 2 +- modules/gnome-extensions/gnome-extensions.sh | 4 ++-- modules/rpm-ostree/rpm-ostree.sh | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/brew/brew.sh b/modules/brew/brew.sh index 06fbc23..c343b1b 100644 --- a/modules/brew/brew.sh +++ b/modules/brew/brew.sh @@ -75,7 +75,7 @@ touch /.dockerenv # Always install Brew echo "Downloading and installing Brew..." -curl -sfLo /tmp/brew-install https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh +curl -fLs https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o /tmp/brew-install echo "Downloaded Brew install script" chmod +x /tmp/brew-install /tmp/brew-install diff --git a/modules/chezmoi/chezmoi.sh b/modules/chezmoi/chezmoi.sh index 5c1f0d9..201d52f 100644 --- a/modules/chezmoi/chezmoi.sh +++ b/modules/chezmoi/chezmoi.sh @@ -93,7 +93,7 @@ else echo "Checking if curl is installed and executable at /usr/bin/curl" if [ -x /usr/bin/curl ]; then echo "Downloading chezmoi binary from the latest Github release" - /usr/bin/curl -fLs https://github.com/twpayne/chezmoi/releases/latest/download/chezmoi-linux-amd64 -o /usr/bin/chezmoi + /usr/bin/curl -fLs --create-dirs https://github.com/twpayne/chezmoi/releases/latest/download/chezmoi-linux-amd64 -o /usr/bin/chezmoi echo "Downloaded chezmoi binary and installed into /usr/bin" echo "Ensuring chezmoi is executable" /usr/bin/chmod 755 /usr/bin/chezmoi diff --git a/modules/fonts/sources/google-fonts.sh b/modules/fonts/sources/google-fonts.sh index 38a9f8c..2aad554 100644 --- a/modules/fonts/sources/google-fonts.sh +++ b/modules/fonts/sources/google-fonts.sh @@ -31,7 +31,7 @@ for FONT in "${FONTS[@]}"; do if FILENAME=$(echo "${FILE_REF}" | jq -er '.filename' 2>/dev/null); then if URL=$(echo "${FILE_REF}" | jq -er '.url' 2>/dev/null); then echo "Downloading ${FILENAME} from ${URL}" - curl "${URL}" -sfo "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename + curl -fLs --create-dirs "${URL}" -o "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename echo "Downloaded ${FILENAME}" else echo "Failed to extract URLs for: ${FONT}" >&2 diff --git a/modules/fonts/sources/nerd-fonts.sh b/modules/fonts/sources/nerd-fonts.sh index c5550b8..18cb1db 100644 --- a/modules/fonts/sources/nerd-fonts.sh +++ b/modules/fonts/sources/nerd-fonts.sh @@ -15,7 +15,7 @@ for FONT in "${FONTS[@]}"; do mkdir -p "${DEST}/${FONT}" echo "Downloading ${FONT} from ${URL}/${FONT}.tar.xz" - curl "${URL}/${FONT}.tar.xz" -sfL -o "/tmp/fonts/${FONT}.tar.xz" + curl -fLs --create-dirs "${URL}/${FONT}.tar.xz" -o "/tmp/fonts/${FONT}.tar.xz" echo "Downloaded ${FONT}" tar -xf "/tmp/fonts/${FONT}.tar.xz" -C "${DEST}/${FONT}" diff --git a/modules/gnome-extensions/gnome-extensions.sh b/modules/gnome-extensions/gnome-extensions.sh index ef6b35f..9f40ae4 100644 --- a/modules/gnome-extensions/gnome-extensions.sh +++ b/modules/gnome-extensions/gnome-extensions.sh @@ -56,7 +56,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]]; then echo "Installing ${EXTENSION} Gnome extension with version ${VERSION}" # Download archive echo "Downloading ZIP archive ${URL}" - curl -fs -o "${ARCHIVE_DIR}" "${URL}" + curl -fLs --create-dirs "${URL}" -o "${ARCHIVE_DIR}" echo "Downloaded ZIP archive ${URL}" # Extract archive echo "Extracting ZIP archive" @@ -185,7 +185,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then echo "Installing '${EXT_NAME}' Gnome extension with version ${SUITABLE_VERSION}" # Download archive echo "Downloading ZIP archive ${URL}" - curl -fs -o "${ARCHIVE_DIR}" "${URL}" + curl -fLs --create-dirs "${URL}" -o "${ARCHIVE_DIR}" echo "Downloaded ZIP archive ${URL}" # Extract archive echo "Extracting ZIP archive" diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index dcd49e9..cfdc813 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -15,7 +15,7 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then REPO_URL="${REPO//[$'\t\r\n ']}" echo "Downloading repo file ${REPO_URL}" - curl -fs --output-dir "/etc/yum.repos.d/" -O "${REPO_URL}" + curl -fLs --create-dirs -O "${REPO_URL}" --output-dir "/etc/yum.repos.d/" echo "Downloaded repo file ${REPO_URL}" elif [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" != "https://copr.fedorainfracloud.org/coprs/"* ]]; then REPO_URL="${REPO//[$'\t\r\n ']}" @@ -23,7 +23,7 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then CLEAN_REPO_NAME="${CLEAN_REPO_NAME//\//.}" echo "Downloading repo file ${REPO_URL}" - curl -fs -o "/etc/yum.repos.d/${CLEAN_REPO_NAME}" "${REPO_URL}" + curl -fLs --create-dirs "${REPO_URL}" -o "/etc/yum.repos.d/${CLEAN_REPO_NAME}" echo "Downloaded repo file ${REPO_URL}" elif [[ ! "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == *".repo" ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" ]]; then cp "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" "/etc/yum.repos.d/${REPO##*/}" @@ -170,7 +170,7 @@ if [[ ${#REPLACE[@]} -gt 0 ]]; then REPO_URL="${REPO//[$'\t\r\n ']}" echo "Downloading repo file ${REPO_URL}" - curl -fs --output-dir "/etc/yum.repos.d/" -O "${REPO_URL}" + curl -fLs --create-dirs -O "${REPO_URL}" --output-dir "/etc/yum.repos.d/" echo "Downloaded repo file ${REPO_URL}" rpm-ostree override replace --experimental --from "repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME}" "${REPLACE_STR}" From 3148cb639fffa7db1019e41b0e8d676c517d702b Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:20:31 +0200 Subject: [PATCH 14/17] chore: Some further missed standardization --- modules/bling/installers/gnome-vrr.sh | 2 +- modules/bling/installers/ublue-update.sh | 2 +- modules/brew/brew.sh | 2 +- modules/yafti/yafti.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/bling/installers/gnome-vrr.sh b/modules/bling/installers/gnome-vrr.sh index 391f723..88f223c 100644 --- a/modules/bling/installers/gnome-vrr.sh +++ b/modules/bling/installers/gnome-vrr.sh @@ -12,7 +12,7 @@ fi REPO_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" echo "Downloading repo file ${REPO_URL}" -curl -fs -o "/etc/yum.repos.d/ublue-os-staging.repo" "${REPO_URL}" +curl -fLs --create-dirs "${REPO_URL}" -o "/etc/yum.repos.d/ublue-os-staging.repo" echo "Downloaded repo file ${REPO_URL}" rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland diff --git a/modules/bling/installers/ublue-update.sh b/modules/bling/installers/ublue-update.sh index 6b8ae20..c5d9335 100644 --- a/modules/bling/installers/ublue-update.sh +++ b/modules/bling/installers/ublue-update.sh @@ -30,7 +30,7 @@ systemctl disable rpm-ostreed-automatic.timer # Fetch ublue COPR REPO_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" echo "Downloading repo file ${REPO_URL}" -curl -fs -o "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO_URL}" +curl -fLs --create-dirs "${REPO_URL}" -o "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" echo "Downloaded repo file ${REPO_URL}" # topgrade is REQUIRED by ublue-update to install diff --git a/modules/brew/brew.sh b/modules/brew/brew.sh index c343b1b..fdc96ae 100644 --- a/modules/brew/brew.sh +++ b/modules/brew/brew.sh @@ -75,7 +75,7 @@ touch /.dockerenv # Always install Brew echo "Downloading and installing Brew..." -curl -fLs https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o /tmp/brew-install +curl -fLs --create-dirs https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o /tmp/brew-install echo "Downloaded Brew install script" chmod +x /tmp/brew-install /tmp/brew-install diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh index b6194a8..fb8dcb0 100644 --- a/modules/yafti/yafti.sh +++ b/modules/yafti/yafti.sh @@ -28,7 +28,7 @@ if [ -f "$STAGING_REPO_PATH" ]; then fi echo "Downloading repo file ${REPO_URL}" -curl -fs -o "${STAGING_REPO_PATH}" "${REPO_URL}" +curl -fLs --create-dirs "${REPO_URL}" -o "${STAGING_REPO_PATH}" echo "Downloaded repo file ${REPO_URL}" rpm-ostree install libadwaita yafti From dd27d55587a7194432c895958afd1097ab2372ad Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:32:11 +0200 Subject: [PATCH 15/17] docs: Add info on standardized way to download files --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e9c63e..0c9009b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,12 @@ These are general guidelines for writing official bash modules and their documen - If you want to insert another regular string as a suffix or prefix to the `"${variable_name}"`, you should do that in this format: `"prefix-${variable_name}-suffix"` - Use `set -euo pipefail` at the start of the script, to ensure that module will fail the image build if error is caught. - You can also use `set -euxo pipefail` during debugging, where each executed command is printed. This should not be used in a published module. - +- For downloading files, we utilize `curl`. Here's the template for what we're using: + - Download file with differently specified filename: +`curl -fLs --create-dirs "${URL}" -o "${DIR}/${FILENAME.EXT}"` + - Download file to directory with no filename changes: +`curl -fLs --create-dirs -O "${URL}" --output-dir "${DIR}"` + Using [Shellcheck](https://www.shellcheck.net/) in your editor is recommended. ### Documentation From 4070610b2474adf0294c997da1b834b0f1407201 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Wed, 18 Sep 2024 17:40:14 -0400 Subject: [PATCH 16/17] chore: Update public key --- cosign.pub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cosign.pub b/cosign.pub index 840ae54..f6d7dbf 100644 --- a/cosign.pub +++ b/cosign.pub @@ -1,4 +1,4 @@ -----BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEk/2hQrKLFNf66dOyCEoUCip38EZh -I4NQN1BiVQ+6IRXkHCJahZfPtC9RqJ3dpGm/2CSdjKyES+vDQrUFj8vsmg== +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3p9P+2gkXsdiSLnfvajHYC3UFcj9 +xpieDNIx7Azav7KtgeqFKKLFWANBA+cb71ch9tuCEftAOtDI7ypL6AHIhQ== -----END PUBLIC KEY----- From e781b0b1ea6ab31a4a9ebe0b68138cbd3f55c420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nh=C6=B0=20B=E1=BA=A3o=20Tr=C6=B0=C6=A1ng?= <28810481+nhubaotruong@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:13:46 +0700 Subject: [PATCH 17/17] Fix: rpm-ostree don't quote REPLACE_STR (#333) rpm-ostree don't quote REPLACE_STR Quoting ${REPLACE_STR} makes it being considered 1 package, failing pipelines --- modules/rpm-ostree/rpm-ostree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rpm-ostree/rpm-ostree.sh b/modules/rpm-ostree/rpm-ostree.sh index cfdc813..f89f065 100644 --- a/modules/rpm-ostree/rpm-ostree.sh +++ b/modules/rpm-ostree/rpm-ostree.sh @@ -173,7 +173,7 @@ if [[ ${#REPLACE[@]} -gt 0 ]]; then curl -fLs --create-dirs -O "${REPO_URL}" --output-dir "/etc/yum.repos.d/" echo "Downloaded repo file ${REPO_URL}" - rpm-ostree override replace --experimental --from "repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME}" "${REPLACE_STR}" + rpm-ostree override replace --experimental --from "repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME}" ${REPLACE_STR} rm "/etc/yum.repos.d/${FILE_NAME}" done