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