From 91a5ccb80efb132ea959cd017696e2172a25cdf5 Mon Sep 17 00:00:00 2001 From: Maksim Ivanov <34414986+Ld-Hagen@users.noreply.github.com> Date: Fri, 31 May 2024 21:27:08 +0300 Subject: [PATCH] replaced wget with curl --- README.md | 8 ++++---- install.sh | 4 ++-- scripts/fix-opera.hook | 3 ++- scripts/fix-opera.sh | 19 ++++++++++++------- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5a33a91..aea7862 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Requirements -1. **wget** (Is needed for downloading the ffmpeg lib and widevine) +1. **curl** (Is needed for downloading the ffmpeg lib and widevine) **unzip** (Is needed for unpacking the downloaded file) @@ -16,11 +16,11 @@ **jq** (Is needed for parsing JSON from github) - For Debian-based systems: `sudo apt install wget unzip git jq` + For Debian-based systems: `sudo apt install curl unzip git jq` - For Arch-based systems: `sudo pacman -S wget unzip git jq` + For Arch-based systems: `sudo pacman -S curl unzip git jq` - For RedHat-based systems: `sudo dnf install wget unzip git jq` + For RedHat-based systems: `sudo dnf install curl unzip git jq` 3. (*Optional*) **python3-dnf-plugin-post-transaction-actions** (Is needed for autoupdate in RedHat-based systems) `dnf install python3-dnf-plugin-post-transaction-actions` diff --git a/install.sh b/install.sh index 6165082..8fd4620 100755 --- a/install.sh +++ b/install.sh @@ -14,8 +14,8 @@ if ! which unzip > /dev/null; then exit 1 fi -if ! which wget > /dev/null; then - printf '\033[1mwget\033[0m package must be installed to run this script\n' +if ! which curl > /dev/null; then + printf '\033[1mcurl\033[0m package must be installed to run this script\n' exit 1 fi diff --git a/scripts/fix-opera.hook b/scripts/fix-opera.hook index 96b9226..2cff720 100644 --- a/scripts/fix-opera.hook +++ b/scripts/fix-opera.hook @@ -10,6 +10,7 @@ Target = opera Description = Fix video playback in Opera browser When = PostTransaction Depends = bash -Depends = wget +Depends = curl Depends = unzip +Depends = jq Exec = /root/.scripts/fix-opera.sh diff --git a/scripts/fix-opera.sh b/scripts/fix-opera.sh index f8bc72b..641a313 100755 --- a/scripts/fix-opera.sh +++ b/scripts/fix-opera.sh @@ -15,8 +15,13 @@ if ! which unzip > /dev/null; then exit 1 fi -if ! which wget > /dev/null; then - printf '\033[1mwget\033[0m package must be installed to run this script\n' +if ! which curl > /dev/null; then + printf '\033[1mcurl\033[0m package must be installed to run this script\n' + exit 1 +fi + +if ! which jq > /dev/null; then + printf '\033[1mjq\033[0m package must be installed to run this script\n' exit 1 fi @@ -47,8 +52,8 @@ fi #Getting download links printf 'Getting download links...\n' ##ffmpeg -readonly FFMPEG_URL_MAIN=$(wget -q4O - $FFMPEG_SRC_MAIN | jq -r '.[0].assets[0].browser_download_url') -readonly FFMPEG_URL_ALT=$(wget -q4O - $FFMPEG_SRC_ALT | jq -r '.[0].assets[0].browser_download_url') +readonly FFMPEG_URL_MAIN=$(curl -sL4 $FFMPEG_SRC_MAIN | jq -r '.[0].assets[0].browser_download_url') +readonly FFMPEG_URL_ALT=$(curl -sL4 $FFMPEG_SRC_ALT | jq -r '.[0].assets[0].browser_download_url') [[ $(basename $FFMPEG_URL_ALT) < $(basename $FFMPEG_URL_MAIN) ]] && readonly FFMPEG_URL=$FFMPEG_URL_MAIN || readonly FFMPEG_URL=$FFMPEG_URL_ALT if [[ -z $FFMPEG_URL ]]; then printf 'Failed to get ffmpeg download URL. Exiting...\n' @@ -57,7 +62,7 @@ fi ##Widevine if $FIX_WIDEVINE; then - readonly WIDEVINE_LATEST=`wget -q4O - $WIDEVINE_VERSIONS | tail -n1` + readonly WIDEVINE_LATEST=`curl -sL4 $WIDEVINE_VERSIONS | tail -n1` readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip" fi @@ -65,14 +70,14 @@ fi printf 'Downloading files...\n' mkdir -p "$TEMP_DIR/opera-fix" ##ffmpeg -wget -q4 --progress=bar:force:noscroll $FFMPEG_URL -O "$TEMP_DIR/opera-fix/ffmpeg.zip" +curl -L4 --progress-bar $FFMPEG_URL -o "$TEMP_DIR/opera-fix/ffmpeg.zip" if [ $? -ne 0 ]; then printf 'Failed to download ffmpeg. Check your internet connection or try later\n' exit 1 fi ##Widevine if $FIX_WIDEVINE; then - wget -q4 --progress=bar:force:noscroll "$WIDEVINE_URL" -O "$TEMP_DIR/opera-fix/widevine.zip" + curl -L4 --progress-bar "$WIDEVINE_URL" -o "$TEMP_DIR/opera-fix/widevine.zip" if [ $? -ne 0 ]; then printf 'Failed to download Widevine CDM. Check your internet connection or try later\n' exit 1