No hardcoded Opera directory in apt hook. Some text messages and readme changes

README.md

@@ -1,35 +1,38 @@
-# Fix Opera Linux ffmpeg & WidevineCdm
+# Fix Opera Linux libffmpeg & WidevineCdm
 
-* Fix Opera html5 media content including DRM-protected one.
+* Fixes Opera html5 media content including DRM-protected one.
-* It script must be execute all times opera will fails on showing html5 media content.
+* This script must be executed all times opera fails on showing html5 media content.
-* On Debian-based and Arch-based distros it may be started automatically after Opera update.
+* On Debian-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)
+1. **wget** (Is needed for downloading the ffmpeg lib and widevine)
     ```sudo apt install wget```
 
 2. **unzip** (Is needed for unpacking the downloaded file)
     ```sudo apt install unzip```
 
+2. **git** (Is needed for fetching this script)
+	    ```sudo apt install git```
+
 ## Usage
 
-1. Clone this repo and 
+1. Clone this repo
 
     ```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```
-    
+
 3. (*Optional*) Run script. And if it works well go to next step.
 
     ```sudo ./scripts/fix-opera.sh```
 
 4. Run install script and answer few questions.
-    
+
     ```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)"
@@ -20,10 +35,12 @@ create_hook ()
 			"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
 				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;;
 			"0" )
 				printf "Autostart for your Linux distro is currently unsupported\n"
@@ -34,6 +51,8 @@ create_hook ()
 	done
 }
 
+ptintf '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
@@ -41,7 +60,7 @@ while read FIX_WIDEVINE; do
 			printf 'Setting FIX_WIDEVINE to true...\n'
 			sed -i '/FIX_WIDEVINE=/s/false/true/g' $SCRIPT_PATH/scripts/fix-opera.sh
 			break;;
-		"n" | "N")	
+		"n" | "N")
 			printf 'Setting FIX_WIDEVINE to false...\n'
 			sed -i '/FIX_WIDEVINE=/s/true/false/g' $SCRIPT_PATH/scripts/fix-opera.sh
 			break;;
@@ -53,6 +72,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
@@ -61,7 +81,7 @@ while read CREATE_ALIAS; do
 			echo "alias fix-opera='sudo ~root/.scripts/fix-opera.sh' # Opera fix HTML5 media" >> $USER_HOME/.bashrc
 			printf "Alias \"fix-opera\" will be available after your next logon.\n"
 			break;;
-		"n" | "N")	
+		"n" | "N")
 			break;;
 		*        )
 			printf "Would you like to create an alias for user $USER_NAME? [y/n]"
@@ -75,7 +95,7 @@ while read CREATE_HOOK; do
 		"y" | "Y")
 			create_hook
 			break;;
-		"n" | "N")	
+		"n" | "N")
 			break;;
 		*        )
 			printf "Would you like to create an alias for user $USER_NAME? [y/n]"
@@ -83,3 +103,16 @@ while read CREATE_HOOK; do
 	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::Pre-Invoke {"stat -c %Z $(readlink -f $(which 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::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.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

@@ -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
+#Removing temporary files
-printf 'Removing temprary files...\n'
+printf 'Removing temporary files...\n'
 rm -rf "$TEMP_DIR/opera-fix"