chore: Switch from wget to curl
This commit is contained in:
parent
31a848c24e
commit
7112d80598
4 changed files with 19 additions and 6 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue