diff --git a/modules/bling/installers/gnome-vrr.sh b/modules/bling/installers/gnome-vrr.sh index d89ab6b..88f223c 100644 --- a/modules/bling/installers/gnome-vrr.sh +++ b/modules/bling/installers/gnome-vrr.sh @@ -9,8 +9,12 @@ 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" +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 -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 -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 diff --git a/modules/bling/installers/ublue-update.sh b/modules/bling/installers/ublue-update.sh index f5202c9..c5d9335 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 -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 rpm-ostree install topgrade diff --git a/modules/brew/brew.sh b/modules/brew/brew.sh index 06fbc23..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 -sfLo /tmp/brew-install https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh +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/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 880efb2..9f40ae4 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 -fLs --create-dirs "${URL}" -o "${ARCHIVE_DIR}" + 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 -fLs --create-dirs "${URL}" -o "${ARCHIVE_DIR}" + echo "Downloaded ZIP archive ${URL}" # Extract archive echo "Extracting ZIP archive" unzip "${ARCHIVE_DIR}" -d "${TMP_DIR}" > /dev/null 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}" diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh index 146ecc7..fb8dcb0 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 -fLs --create-dirs "${REPO_URL}" -o "${STAGING_REPO_PATH}" +echo "Downloaded repo file ${REPO_URL}" rpm-ostree install libadwaita yafti