Merge pull request #36 from valdineidossantos/fix_jq_syntax

fix: correct jq syntax for fetching latest ffmpeg release URLs

README.md

@@ -2,37 +2,61 @@
 
 * Fixes Opera html5 media content including DRM-protected one.
 * This script must be executed all times opera fails on showing html5 media content.
-* On Debian-based and Arch-based distributions it could be started automatically after Opera each update or reinstall.
+* On Debian-based, RedHat-based and Arch-based distributions it could be started automatically after Opera each update or reinstall.
+* Works only with native versions of Opera. Won't work with flatpak/snap releses.
+* May not work with opera-beta and opera-develper.
 
 ## Requirements
 
-1. **wget** (Is needed for downloading the ffmpeg lib and widevine)
-    ```sudo apt install wget```
+1. **curl** (Is needed for downloading the ffmpeg lib and widevine)
 
-2. **unzip** (Is needed for unpacking the downloaded file)
-    ```sudo apt install unzip```
+   **unzip** (Is needed for unpacking the downloaded file)
 
-2. **git** (Is needed for fetching this script)
-	    ```sudo apt install git```
+   **git** (Is needed for fetching this script)
+
+   **jq** (Is needed for parsing JSON from github)
+
+	For Debian-based systems: `sudo apt install curl unzip git jq`
+
+	For Arch-based systems: `sudo pacman -S curl 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`
 
 ## Usage
 
 1. Clone this repo
 
-    ```git clone https://github.com/Ld-Hagen/fix-opera-linux-ffmpeg-widevine.git```
+    `git clone https://github.com/Ld-Hagen/fix-opera-linux-ffmpeg-widevine.git`
 
 2. Go to the repo root folder
 
-    ```cd ./fix-opera-linux-ffmpeg-widevine```
+    `cd ./fix-opera-linux-ffmpeg-widevine`
 
 3. (*Optional*) Run script. And if it works well go to next step.
 
-    ```sudo ./scripts/fix-opera.sh```
+    `sudo ./scripts/fix-opera.sh`
 
 4. Run install script and answer few questions.
 
-    ```sudo ./install.sh```
+    `sudo ./install.sh`
 
-5. Delete the repo
+## How to uninstall
 
-    ```cd .. && rm -rf ./fix-opera-linux-ffmpeg-widevine```
+1. Clone this repo
+
+    `cd /tmp && git clone https://github.com/Ld-Hagen/fix-opera-linux-ffmpeg-widevine.git`
+
+2. Go to the repo root folder
+
+    `cd /tmp/fix-opera-linux-ffmpeg-widevine`
+
+3. Make uninstall.sh executable
+
+   `chmod +x uninstall.sh`
+
+5. Run uninstallation script. And if it works well go to next step.
+
+    `sudo ./uninstall.sh`

install.sh

@@ -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
 
@@ -29,6 +34,7 @@ create_hook ()
 	printf 'Choose your Linux distro:\n'
 	printf '	1. Debian-based (Debian/Ubuntu/Mint/etc.)\n'
 	printf '	2. Arch-based (Arch/Manjaro/etc.)\n'
+	printf '	3. RedHat-based (RedHat/Fedora/etc.)\n'
 	printf '	0. Other\n'
 	while read -p "Your choice: " DISTRIB; do
 		case $DISTRIB in
@@ -38,10 +44,16 @@ create_hook ()
 				printf 'Now the script will run automatically every time apt installs or updates Opera.\n'
 				break;;
 			"2" )
-				cp -f $SCRIPT_PATH/scripts/fix-opera.hook $INSTALL_PATH /usr/share/libalpm/hooks
+				cp -f $SCRIPT_PATH/scripts/fix-opera.hook $INSTALL_PATH
 				ln -sf $INSTALL_PATH/fix-opera.hook /usr/share/libalpm/hooks/
 				printf 'Now the script will run automatically every time pacman installs or updates Opera.\n'
 				break;;
+			"3" )
+				dnf install python3-dnf-plugin-post-transaction-actions -y
+				cp -f $SCRIPT_PATH/scripts/fix-opera.action $INSTALL_PATH
+				ln -sf $INSTALL_PATH/fix-opera.action /etc/dnf/plugins/post-transaction-actions.d/
+				printf 'Now the script will run automatically every time dnf installs or updates Opera.\n'
+				break;;
 			"0" )
 				printf "Autostart for your Linux distro is currently unsupported\n"
 				break;;
@@ -51,7 +63,7 @@ create_hook ()
 	done
 }
 
-ptintf 'Installing script to your system...\n'
+printf 'Installing script to your system...\n'
 
 printf 'Would you like to apply Widevine CDM fix? [y/n]'
 while read FIX_WIDEVINE; do
@@ -98,7 +110,7 @@ while read CREATE_HOOK; do
 		"n" | "N")
 			break;;
 		*        )
-			printf "Would you like to create an alias for user $USER_NAME? [y/n]"
+			printf "Would you like to run it automatically after each Opera update?? [y/n]"
 			continue;;
 	esac
 done

scripts/99fix-opera

@@ -1,2 +1,2 @@
-DPkg::Pre-Invoke {"stat -c %Z $(readlink -f $(which opera)) > /tmp/opera.timestamp";};
-DPkg::Post-Invoke {"if [ `stat -c %Z $(readlink -f $(which opera))` -ne `cat /tmp/opera.timestamp` ]; then /root/.scripts/fix-opera.sh; fi; rm /tmp/opera.timestamp";};
+DPkg::Pre-Invoke {"stat -c %Z $(readlink -f $(which opera)) > /tmp/opera.timestamp  2> /dev/null || echo 0 > /tmp/opera.timestamp";};
+DPkg::Post-Invoke {"set NEW_OPERA=`stat -c %Z $(readlink -f $(which opera))` || exit 0; set OLD_OPERA=`cat /tmp/opera.timestamp` || exit 0; if [ "$NEW_OPERA" != "$OLD_OPERA" ]; then /root/.scripts/fix-opera.sh; fi; rm -f /tmp/opera.timestamp";};

scripts/fix-opera.action

@@ -0,0 +1 @@
+opera-stable:in:/root/.scripts/fix-opera.sh

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

scripts/fix-opera.sh

@@ -15,32 +15,46 @@ 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
+
+if which pacman &> /dev/null; then
+	ARCH_SYSTEM=true
+fi
+
 #Config section
 readonly FIX_WIDEVINE=true
-readonly TEMP_DIR='/tmp'
-readonly FFMPEG_SRC_MAIN='https://api.github.com/repos/iteufel/nwjs-ffmpeg-prebuilt/releases'
+readonly FIX_DIR='/tmp/opera-fix'
+readonly FFMPEG_SRC_MAIN='https://api.github.com/repos/Ld-Hagen/nwjs-ffmpeg-prebuilt/releases'
 readonly FFMPEG_SRC_ALT='https://api.github.com/repos/Ld-Hagen/fix-opera-linux-ffmpeg-widevine/releases'
 readonly WIDEVINE_VERSIONS='https://dl.google.com/widevine-cdm/versions.txt'
 readonly FFMPEG_SO_NAME='libffmpeg.so'
 readonly WIDEVINE_SO_NAME='libwidevinecdm.so'
 readonly WIDEVINE_MANIFEST_NAME='manifest.json'
 
-readonly OPERA_DIR=$(dirname $(readlink -f $(which opera)))
-readonly OPERA_LIB_DIR="$OPERA_DIR/lib_extra"
-readonly OPERA_WIDEVINE_DIR="$OPERA_LIB_DIR/WidevineCdm"
-readonly OPERA_WIDEVINE_SO_DIR="$OPERA_WIDEVINE_DIR/_platform_specific/linux_x64"
-readonly OPERA_WIDEVINE_CONFIG="$OPERA_DIR/resources/widevine_config.json"
+OPERA_VERSIONS=()
+
+if [ -x "$(command -v opera)" ]; then
+  OPERA_VERSIONS+=("opera")
+fi
+
+if [ -x "$(command -v opera-beta)" ]; then
+  OPERA_VERSIONS+=("opera-beta")
+fi
 
 #Getting download links
 printf 'Getting download links...\n'
+
 ##ffmpeg
-readonly FFMPEG_URL_MAIN=$(wget -qO - $FFMPEG_SRC_MAIN | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
-readonly FFMPEG_URL_ALT=$(wget -qO - $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 -rS 'sort_by(.published_at) | .[-1].assets[0].browser_download_url')
+readonly FFMPEG_URL_ALT=$(curl -sL4 $FFMPEG_SRC_ALT | jq -rS 'sort_by(.published_at) | .[-1].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'
@@ -48,38 +62,71 @@ if [[ -z $FFMPEG_URL ]]; then
 fi
 
 ##Widevine
-if $FIX_WIDEVINE; then
-	readonly WIDEVINE_LATEST=`wget -qO - $WIDEVINE_VERSIONS | tail -n1`
-	readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip"
-fi
+#if $FIX_WIDEVINE; then
+#  readonly WIDEVINE_LATEST=`curl -sL4 $WIDEVINE_VERSIONS | tail -n1`
+#  readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip"
+#fi
 
 #Downloading files
 printf 'Downloading files...\n'
-mkdir -p "$TEMP_DIR/opera-fix"
+mkdir -p "$FIX_DIR"
 ##ffmpeg
-wget -q --show-progress $FFMPEG_URL -O "$TEMP_DIR/opera-fix/ffmpeg.zip"
+
+curl -L4 --progress-bar $FFMPEG_URL -o "$FIX_DIR/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 -q --show-progress "$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'
+  echo "Finding a working Widevine version..."
+  # Get all versions, newest last
+  versions=$(curl -sL4 "$WIDEVINE_VERSIONS")
+  # Loop through in reverse order (newest first)
+  for ver in $(echo "$versions" | tac); do
+    test_url="https://dl.google.com/widevine-cdm/${ver}-linux-x64.zip"
+    # Check if the URL exists (no 404)
+    if curl --progress-bar --fail "$test_url" -o "$FIX_DIR/widevine.zip"; then
+      WIDEVINE_LATEST="$ver"
+      WIDEVINE_URL="$test_url"
+      echo -e "Trying Widevine version $WIDEVINE_LATEST from $WIDEVINE_URL\n"
+      break
+    else
+      echo "Widevine version $ver not available, trying older..."
+    fi
+  done
+
+  if [[ -z "$WIDEVINE_URL" ]]; then
+    echo "Failed to find a working Widevine version. Exiting..."
     exit 1
   fi
+  #readonly WIDEVINE_LATEST
+  #readonly WIDEVINE_URL
 fi
 
 #Extracting files
 printf 'Extracting files...\n'
 ##ffmpeg
-unzip -o "$TEMP_DIR/opera-fix/ffmpeg.zip" -d $TEMP_DIR/opera-fix > /dev/null
+unzip -o "$FIX_DIR/ffmpeg.zip" -d $FIX_DIR > /dev/null
 ##Widevine
 if $FIX_WIDEVINE; then
-	unzip -o "$TEMP_DIR/opera-fix/widevine.zip" -d $TEMP_DIR/opera-fix > /dev/null
+  echo "unzip -o \"$FIX_DIR/widevine.zip\" -d $FIX_DIR"
+  unzip -o "$FIX_DIR/widevine.zip" -d $FIX_DIR > /dev/null
 fi
 
+for opera in ${OPERA_VERSIONS[@]}; do
+  echo "Doing $opera"
+  EXECUTABLE=$(command -v "$opera")
+	if [[ "$ARCH_SYSTEM" == true ]]; then
+		OPERA_DIR=$(dirname $(cat $EXECUTABLE | grep exec | cut -d ' ' -f 2))
+	else
+		OPERA_DIR=$(dirname $(readlink -f $EXECUTABLE))
+	fi
+  OPERA_LIB_DIR="$OPERA_DIR/lib_extra"
+  OPERA_WIDEVINE_DIR="$OPERA_LIB_DIR/WidevineCdm"
+  OPERA_WIDEVINE_SO_DIR="$OPERA_WIDEVINE_DIR/_platform_specific/linux_x64"
+  OPERA_WIDEVINE_CONFIG="$OPERA_DIR/resources/widevine_config.json"
+
   #Removing old libraries and preparing directories
   printf 'Removing old libraries & making directories...\n'
   ##ffmpeg
@@ -94,17 +141,18 @@ fi
   #Moving libraries to its place
   printf 'Moving libraries to their places...\n'
   ##ffmpeg
-mv -f "$TEMP_DIR/opera-fix/$FFMPEG_SO_NAME" "$OPERA_LIB_DIR"
+  cp -f "$FIX_DIR/$FFMPEG_SO_NAME" "$OPERA_LIB_DIR"
   chmod 0644 "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
   ##Widevine
   if $FIX_WIDEVINE; then
-	mv -f "$TEMP_DIR/opera-fix/$WIDEVINE_SO_NAME" "$OPERA_WIDEVINE_SO_DIR"
+    cp -f "$FIX_DIR/$WIDEVINE_SO_NAME" "$OPERA_WIDEVINE_SO_DIR"
     chmod 0644 "$OPERA_WIDEVINE_SO_DIR/$WIDEVINE_SO_NAME"
-	mv -f "$TEMP_DIR/opera-fix/$WIDEVINE_MANIFEST_NAME" "$OPERA_WIDEVINE_DIR"
+    cp -f "$FIX_DIR/$WIDEVINE_MANIFEST_NAME" "$OPERA_WIDEVINE_DIR"
     chmod 0644 "$OPERA_WIDEVINE_DIR/$WIDEVINE_MANIFEST_NAME"
     printf "[\n      {\n         \"preload\": \"$OPERA_WIDEVINE_DIR\"\n      }\n]\n" > "$OPERA_WIDEVINE_CONFIG"
   fi
+done
 
 #Removing temporary files
 printf 'Removing temporary files...\n'
-rm -rf "$TEMP_DIR/opera-fix"
+rm -rf "$FIX_DIR"

uninstall.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+readonly INSTALL_PATH="/root/.scripts"
+readonly USER_NAME="$(logname)"
+readonly USER_HOME=$(sudo -u $USER_NAME sh -c 'echo $HOME')
+
+rm /etc/apt/apt.conf.d/99fix-opera
+rm /usr/share/libalpm/hooks/fix-opera.hook
+rm /etc/dnf/plugins/post-transaction-actions.d/fix-opera.action
+sed -i '/alias fix-opera/d' $USER_HOME/.bashrc
+rm -rf $INSTALL_PATH