Merge pull request #11 from leonmcar1/patch-1

Disable ipv6 for wget

README.md

@@ -1,35 +1,44 @@
-# Fix Opera Linux ffmpeg & WidevineCdm
+# Fix Opera Linux libffmpeg & WidevineCdm
 
-* Fix Opera html5 media content including DRM-protected one.
-* It script must be execute all times opera will fails on showing html5 media content.
-* On Debian-based and Arch-based distros it may be started automatically after Opera update.
+* 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, RedHat-based and Arch-based distributions it could be started automatically after Opera each update or reinstall.
 
 ## Requirements
 
-1. **wget** (Is needed for downloading the ffmpeg lib and Chrome)
-    ```sudo apt install wget```
+1. **wget** (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)
+
+   **git** (Is needed for fetching this script)
+
+	For Debian-based systems: `sudo apt install wget unzip git`
+
+	For Arch-based systems: `sudo pacman -S wget unzip git`
+
+	For RedHat-based systems: `sudo dnf install wget unzip git`
+	
+2. (*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 and 
+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
 
-    ```rm -rf ./fix-opera-linux-ffmpeg-widevine```
+    `cd .. && rm -rf ./fix-opera-linux-ffmpeg-widevine`

install.sh

@@ -4,6 +4,21 @@ if [[ $(whoami) != "root" ]]; then
 	exit 1
 fi
 
+if [[ $(uname -m) != "x86_64" ]]; then
+	printf 'This script is intended for 64-bit systems\n'
+	exit 1
+fi
+
+if ! which unzip > /dev/null; then
+	printf '\033[1munzip\033[0m package must be installed to run this script\n'
+	exit 1
+fi
+
+if ! which wget > /dev/null; then
+	printf '\033[1mwget\033[0m package must be installed to run this script\n'
+	exit 1
+fi
+
 readonly SCRIPT_PATH=$(dirname $(readlink -f $0))
 readonly INSTALL_PATH="/root/.scripts"
 readonly USER_NAME="$(logname)"
@@ -14,16 +29,25 @@ 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
 			"1" )
 				cp -f $SCRIPT_PATH/scripts/99fix-opera $INSTALL_PATH
 				ln -sf $INSTALL_PATH/99fix-opera /etc/apt/apt.conf.d/
+				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"
@@ -34,6 +58,8 @@ create_hook ()
 	done
 }
 
+printf 'Installing script to your system...\n'
+
 printf 'Would you like to apply Widevine CDM fix? [y/n]'
 while read FIX_WIDEVINE; do
 	case $FIX_WIDEVINE in
@@ -53,6 +79,7 @@ done
 
 mkdir -p $INSTALL_PATH
 cp -f $SCRIPT_PATH/scripts/fix-opera.sh $INSTALL_PATH
+chmod +x $INSTALL_PATH/fix-opera.sh
 
 printf "Would you like to create an alias for user $USER_NAME? [y/n]"
 while read CREATE_ALIAS; do
@@ -78,8 +105,21 @@ 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
 
+printf "Would you like to run it now? [y/n]"
+while read RUN_NOW; do
+	case $RUN_NOW in
+		"y" | "Y")
+			$INSTALL_PATH/fix-opera.sh
+			break;;
+		"n" | "N")
+			break;;
+		*        )
+			printf "Would you like to run it now? [y/n]"
+			continue;;
+	esac
+done

scripts/99fix-opera

@@ -1,2 +1,2 @@
-DPkg::Pre-Invoke {"stat -c %Z /usr/lib/x86_64-linux-gnu/opera/opera > /tmp/opera.timestamp";};
-DPkg::Post-Invoke {"if [ `stat -c %Z /usr/lib/x86_64-linux-gnu/opera/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";};
+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";};

scripts/fix-opera.action

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

scripts/fix-opera.hook

@@ -9,4 +9,7 @@ Target = opera
 [Action]
 Description = Fix video playback in Opera browser
 When = PostTransaction
+Depends = bash
+Depends = wget
+Depends = unzip
 Exec = /root/.scripts/fix-opera.sh

scripts/fix-opera.sh

@@ -39,8 +39,8 @@ readonly OPERA_WIDEVINE_CONFIG="$OPERA_DIR/resources/widevine_config.json"
 #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=$(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 --inet4-only - $FFMPEG_SRC_ALT | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
 [[ $(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'
@@ -49,7 +49,7 @@ fi
 
 ##Widevine
 if $FIX_WIDEVINE; then
-	readonly WIDEVINE_LATEST=`wget -qO - $WIDEVINE_VERSIONS | tail -n1`
+	readonly WIDEVINE_LATEST=`wget -qO --inet4-only - $WIDEVINE_VERSIONS | tail -n1`
 	readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip"
 fi
 
@@ -57,14 +57,14 @@ fi
 printf 'Downloading files...\n'
 mkdir -p "$TEMP_DIR/opera-fix"
 ##ffmpeg
-wget -q --show-progress $FFMPEG_URL -O "$TEMP_DIR/opera-fix/ffmpeg.zip"
+wget -q --inet4-only --show-progress $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 -q --show-progress "$WIDEVINE_URL" -O "$TEMP_DIR/opera-fix/widevine.zip"
+	wget -q --inet4-only --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'
 		exit 1
@@ -92,7 +92,7 @@ if $FIX_WIDEVINE; then
 fi
 
 #Moving libraries to its place
-printf 'Moving libraries to its place...\n'
+printf 'Moving libraries to their places...\n'
 ##ffmpeg
 mv -f "$TEMP_DIR/opera-fix/$FFMPEG_SO_NAME" "$OPERA_LIB_DIR"
 chmod 0644 "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
@@ -105,6 +105,6 @@ if $FIX_WIDEVINE; then
 	printf "[\n      {\n         \"preload\": \"$OPERA_WIDEVINE_DIR\"\n      }\n]\n" > "$OPERA_WIDEVINE_CONFIG"
 fi
 
-#Removing temprary files
-printf 'Removing temprary files...\n'
+#Removing temporary files
+printf 'Removing temporary files...\n'
 rm -rf "$TEMP_DIR/opera-fix"