Compare commits

...

7 Commits

Author SHA1 Message Date
Maksim Ivanov
91a5ccb80e replaced wget with curl 2024-05-31 21:27:08 +03:00
Maksim Ivanov
f6e3f12c53 Update README.md
added info about jq requirement
2024-05-31 09:17:55 +03:00
Maksim Ivanov
92a3a3f153 Merge pull request #26 from FishyW/main
wget2 related fixes
2024-05-31 09:14:06 +03:00
fishyW
3de916e3ea replace jq with jq -r 2024-05-31 13:49:48 +10:00
fishyW
2d5105a129 'jq check 2024-05-30 22:38:06 +10:00
fishyW
031316d313 gets rid of which: no pacman message in non arch distributions 2024-05-30 22:34:38 +10:00
fishyW
7212c9490f wget compatibility + jq fix 2024-05-30 22:33:17 +10:00
4 changed files with 29 additions and 16 deletions

View File

@@ -8,19 +8,21 @@
## 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)
**git** (Is needed for fetching this script)
For Debian-based systems: `sudo apt install wget unzip git`
**jq** (Is needed for parsing JSON from github)
For Arch-based systems: `sudo pacman -S wget unzip git`
For Debian-based systems: `sudo apt install curl unzip git jq`
For RedHat-based systems: `sudo dnf install wget unzip git`
For Arch-based systems: `sudo pacman -S curl unzip git jq`
2. (*Optional*) **python3-dnf-plugin-post-transaction-actions** (Is needed for autoupdate in RedHat-based systems)
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`
## Usage

View File

@@ -14,8 +14,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

View File

@@ -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

View File

@@ -15,12 +15,17 @@ 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 pacman > /dev/null; then
if ! which jq > /dev/null; then
printf '\033[1mjq\033[0m package must be installed to run this script\n'
exit 1
fi
if which pacman &> /dev/null; then
ARCH_SYSTEM=true
fi
@@ -47,8 +52,8 @@ fi
#Getting download links
printf 'Getting download links...\n'
##ffmpeg
readonly FFMPEG_URL_MAIN=$(wget -q4O - $FFMPEG_SRC_MAIN | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
readonly FFMPEG_URL_ALT=$(wget -q4O - $FFMPEG_SRC_ALT | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
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 --show-progress $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 --show-progress "$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