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

README.md

@@ -2,60 +2,37 @@
 
 * 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.
-* Works only with native versions of Opera. Won't work with flatpak/snap releses.
-* May not work with opera-beta and opera-develper.
+* On Debian-based and Arch-based distributions it could be started automatically after Opera each update or reinstall.
 
 ## Requirements
 
-1. **curl** (is needed for downloading the ffmpeg lib and widevine)
+1. **wget** (Is needed for downloading the ffmpeg lib and widevine)
+    ```sudo apt install wget```
 
-   **unzip** (is needed for unpacking the downloaded file)
+2. **unzip** (Is needed for unpacking the downloaded file)
+    ```sudo apt install unzip```
 
-   **git** (is needed for fetching this script)
-
-   **jq** (is needed for parsing JSON from github)
-
-2. (*Optional*) **python3-dnf-plugin-post-transaction-actions** (is needed for autoupdate in RedHat-based systems)
-
-    The main installer - `install.sh` - auto-detects your distro and installs the both the appropriate and the optional requirements by itself, if they're missing.
+2. **git** (Is needed for fetching this script)
+	    ```sudo apt install git```
 
 ## 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. Make install.sh executable
+4. Run install script and answer few questions.
 
-   `chmod +x ./install.sh`
+    ```sudo ./install.sh```
 
-5. Run install script and answer few questions.
+5. Delete the repo
 
-    `sudo ./install.sh`
-
-## How to uninstall
-
-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`
+    ```cd .. && rm -rf ./fix-opera-linux-ffmpeg-widevine```

install.sh

@@ -1,79 +1,4 @@
 #!/bin/bash
-
-set -euo pipefail
-
-detect_pkg_manager() {
-    if command -v apt-get >/dev/null 2>&1; then
-        PKG_MGR="apt"
-    elif command -v dnf >/dev/null 2>&1; then
-        PKG_MGR="dnf"
-    elif command -v pacman >/dev/null 2>&1; then
-        PKG_MGR="pacman"
-    elif command -v zypper >/dev/null 2>&1; then
-        PKG_MGR="zypper"
-    elif command -v emerge >/dev/null 2>&1; then
-        PKG_MGR="portage"
-    else
-        PKG_MGR="unknown"
-    fi
-
-    if [[ "$PKG_MGR" == "unknown" ]]; then
-        echo "Unsupported package manager"
-        exit 1
-    fi
-}
-
-install_deps() {
-    DEPS=(curl unzip jq)
-
-    case "$PKG_MGR" in
-        apt)
-            apt-get update
-            apt-get install -y "${DEPS[@]}"
-            ;;
-        dnf)
-            dnf install -y "${DEPS[@]} python3-dnf-plugin-post-transaction-actions"
-            ;;
-        pacman)
-            pacman -Sy --needed --noconfirm "${DEPS[@]}"
-            ;;
-        zypper)
-            zypper install -y "${DEPS[@]}"
-            ;;
-        portage)
-            emerge --ask=n "${DEPS[@]}"
-            ;;
-        *)
-            echo "Unsupported package manager. Install dependencies manually:"
-            echo "  ${DEPS[*]}"
-            exit 1
-            ;;
-    esac
-}
-
-install_hook () {
-    case "$PKG_MGR" in
-        apt)
-            cp -f "$SCRIPT_PATH/scripts/99fix-opera" "$INSTALL_PATH"
-            ln -sf "$INSTALL_PATH/99fix-opera" /etc/apt/apt.conf.d/99fix-opera
-            ;;
-        pacman)
-            cp -f "$SCRIPT_PATH/scripts/fix-opera.hook" "$INSTALL_PATH"
-            ln -sf "$INSTALL_PATH/fix-opera.hook" /usr/share/libalpm/hooks/fix-opera.hook
-            ;;
-        dnf)
-            dnf install -y python3-dnf-plugin-post-transaction-actions
-            cp -f "$SCRIPT_PATH/scripts/fix-opera.action" "$INSTALL_PATH"
-            ln -sf "$INSTALL_PATH/fix-opera.action" \
-                /etc/dnf/plugins/post-transaction-actions.d/fix-opera.action
-            ;;
-        *)
-            echo "Automatic hook installation not supported for this system."
-            return 1
-            ;;
-    esac
-}
-
 if [[ $(whoami) != "root" ]]; then
 	printf 'Try to run it with sudo\n'
 	exit 1
@@ -84,34 +9,60 @@ if [[ $(uname -m) != "x86_64" ]]; then
 	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="${SUDO_USER:-$(logname)}"
-readonly USER_HOME=$(getent passwd "$USER_NAME" | cut -d: -f6)
-mkdir -p $INSTALL_PATH
+readonly USER_NAME="$(logname)"
+readonly USER_HOME=$(sudo -u $USER_NAME sh -c 'echo $HOME')
 
-printf 'Installing script to your system...\n'
+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 '	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
+				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"
+				break;;
+			*   )
+				continue;;
+		esac
+	done
+}
 
-detect_pkg_manager
-install_deps
-
-read -p "Enable automatic execution after Opera updates? [y/N] " AUTO
-[[ "$AUTO" =~ ^[Yy]$ ]] && install_hook
-
-mkdir -p "$INSTALL_PATH"
-cp -f "$SCRIPT_PATH/scripts/fix-opera.sh" "$INSTALL_PATH"
-chmod +x "$INSTALL_PATH/fix-opera.sh"
+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
 		"y" | "Y")
 			printf 'Setting FIX_WIDEVINE to true...\n'
-			sed -i '/FIX_WIDEVINE=/s/false/true/g' $INSTALL_PATH/fix-opera.sh
+			sed -i '/FIX_WIDEVINE=/s/false/true/g' $SCRIPT_PATH/scripts/fix-opera.sh
 			break;;
 		"n" | "N")
 			printf 'Setting FIX_WIDEVINE to false...\n'
-			sed -i '/FIX_WIDEVINE=/s/true/false/g' $INSTALL_PATH/fix-opera.sh
+			sed -i '/FIX_WIDEVINE=/s/true/false/g' $SCRIPT_PATH/scripts/fix-opera.sh
 			break;;
 		*        )
 			printf 'Would you like to apply Widevine CDM fix? [y/n]'
@@ -119,6 +70,10 @@ while read FIX_WIDEVINE; do
 	esac
 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
 	case $CREATE_ALIAS in
@@ -134,6 +89,20 @@ while read CREATE_ALIAS; do
 	esac
 done
 
+printf "Would you like to run it automatically after each Opera update? [y/n]"
+while read CREATE_HOOK; do
+	case $CREATE_HOOK in
+		"y" | "Y")
+			create_hook
+			break;;
+		"n" | "N")
+			break;;
+		*        )
+			printf "Would you like to create an alias for user $USER_NAME? [y/n]"
+			continue;;
+	esac
+done
+
 printf "Would you like to run it now? [y/n]"
 while read RUN_NOW; do
 	case $RUN_NOW in
@@ -146,4 +115,4 @@ while read RUN_NOW; do
 			printf "Would you like to run it now? [y/n]"
 			continue;;
 	esac
-done
+done

scripts/99fix-opera

@@ -1,2 +1,2 @@
-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";};
+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

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

scripts/fix-opera.hook

@@ -10,7 +10,6 @@ Target = opera
 Description = Fix video playback in Opera browser
 When = PostTransaction
 Depends = bash
-Depends = curl
+Depends = wget
 Depends = unzip
-Depends = jq
-Exec = /root/.scripts/fix-opera.sh
+Exec = /root/.scripts/fix-opera.sh

scripts/fix-opera.sh

@@ -10,130 +10,101 @@ if [[ $(uname -m) != "x86_64" ]]; then
 	exit 1
 fi
 
-if ! command -v unzip > /dev/null; then
+if ! which unzip > /dev/null; then
 	printf '\033[1munzip\033[0m package must be installed to run this script\n'
 	exit 1
 fi
 
-if ! command -v curl > /dev/null; then
-	printf '\033[1mcurl\033[0m package must be installed to run this script\n'
+if ! which wget > /dev/null; then
+	printf '\033[1mwget\033[0m package must be installed to run this script\n'
 	exit 1
 fi
 
-if ! command -v jq > /dev/null; then
-	printf '\033[1mjq\033[0m package must be installed to run this script\n'
-	exit 1
-fi
-
-if command -v pacman &> /dev/null; then
-	ARCH_SYSTEM=true
-fi
-
 #Config section
 readonly FIX_WIDEVINE=true
-readonly FIX_DIR='/tmp/opera-fix'
-readonly FFMPEG_SRC_MAIN='https://api.github.com/repos/Ld-Hagen/nwjs-ffmpeg-prebuilt/releases'
+readonly TEMP_DIR='/tmp'
+readonly FFMPEG_SRC_MAIN='https://api.github.com/repos/iteufel/nwjs-ffmpeg-prebuilt/releases'
 readonly FFMPEG_SRC_ALT='https://api.github.com/repos/Ld-Hagen/fix-opera-linux-ffmpeg-widevine/releases'
-readonly WIDEVINE_SRC='https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/toolkit/content/gmp-sources/widevinecdm.json'
+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'
 
-OPERA_VERSIONS=()
-
-if [ -x "$(command -v opera)" ]; then
-  OPERA_VERSIONS+=("opera")
-fi
-
-if [ -x "$(command -v opera-beta)" ]; then
-  OPERA_VERSIONS+=("opera-beta")
-fi
+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"
 
 #Getting download links
 printf 'Getting download links...\n'
-
 ##ffmpeg
-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')
+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)
 [[ $(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'
-  exit 1
+	printf 'Failed to get ffmpeg download URL. Exiting...\n'
+	exit 1
 fi
 
 ##Widevine
 if $FIX_WIDEVINE; then
-  readonly WIDEVINE_URL=$(curl -sL4 $WIDEVINE_SRC | jq -r '.vendors."gmp-widevinecdm".platforms."Linux_x86_64-gcc3".mirrorUrls[0]')
+	readonly WIDEVINE_LATEST=`wget -qO - $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 "$FIX_DIR"
+mkdir -p "$TEMP_DIR/opera-fix"
 ##ffmpeg
-
-curl -L4 --progress-bar $FFMPEG_URL -o "$FIX_DIR/ffmpeg.zip"
+wget -q --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
+	printf 'Failed to download ffmpeg. Check your internet connection or try later\n'
+	exit 1
 fi
 ##Widevine
 if $FIX_WIDEVINE;  then
-  curl -L4 --progress-bar "$WIDEVINE_URL" -o "$FIX_DIR/widevine.zip"
-  if [ $? -ne 0 ]; then
-    printf 'Failed to download Widevine CDM. Check your internet connection or try later\n'
-    exit 1
-  fi
+	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'
+		exit 1
+	fi
 fi
 
 #Extracting files
+printf 'Extracting files...\n'
 ##ffmpeg
-echo "Extracting ffmpeg..."
-unzip -o "$FIX_DIR/ffmpeg.zip" -d $FIX_DIR > /dev/null
+unzip -o "$TEMP_DIR/opera-fix/ffmpeg.zip" -d $TEMP_DIR/opera-fix > /dev/null
 ##Widevine
 if $FIX_WIDEVINE; then
-  echo "Extracting WidevineCDM..."
-  unzip -oj "$FIX_DIR/widevine.zip" -d $FIX_DIR > /dev/null 2>/dev/null
+	unzip -o "$TEMP_DIR/opera-fix/widevine.zip" -d $TEMP_DIR/opera-fix > /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
+rm -f "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
+mkdir -p "$OPERA_LIB_DIR"
+##Widevine
+if $FIX_WIDEVINE; then
+	rm -rf "$OPERA_WIDEVINE_DIR"
+	mkdir -p "$OPERA_WIDEVINE_SO_DIR"
+fi
 
-  #Removing old libraries and preparing directories
-  printf 'Removing old libraries & making directories...\n'
-  ##ffmpeg
-  rm -f "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
-  mkdir -p "$OPERA_LIB_DIR"
-  ##Widevine
-  if $FIX_WIDEVINE; then
-    rm -rf "$OPERA_WIDEVINE_DIR"
-    mkdir -p "$OPERA_WIDEVINE_SO_DIR"
-  fi
-
-  #Moving libraries to its place
-  printf 'Moving libraries to their places...\n'
-  ##ffmpeg
-  cp -f "$FIX_DIR/$FFMPEG_SO_NAME" "$OPERA_LIB_DIR"
-  chmod 0644 "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
-  ##Widevine
-  if $FIX_WIDEVINE; then
-    cp -f "$FIX_DIR/$WIDEVINE_SO_NAME" "$OPERA_WIDEVINE_SO_DIR"
-    chmod 0644 "$OPERA_WIDEVINE_SO_DIR/$WIDEVINE_SO_NAME"
-    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
+#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"
+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"
+	chmod 0644 "$OPERA_WIDEVINE_SO_DIR/$WIDEVINE_SO_NAME"
+	mv -f "$TEMP_DIR/opera-fix/$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
 
 #Removing temporary files
 printf 'Removing temporary files...\n'
-rm -rf "$FIX_DIR"
+rm -rf "$TEMP_DIR/opera-fix"

uninstall.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-#
-# This uninstall does NOT remove system packages. It only removes the hooks, aliases and scripts implemented by fix-opera's 'install.sh'.
-#
-
-INSTALL_PATH="/root/.scripts"
-
-# --- privilege check ---
-if [[ "$(id -u)" -ne 0 ]]; then
-    echo "Please run this script with sudo or as root"
-    exit 1
-fi
-
-# --- user resolution ---
-USER_NAME="${SUDO_USER:-$(logname)}"
-USER_HOME=$(getent passwd "$USER_NAME" | cut -d: -f6)
-
-# --- package manager detection ---
-detect_pkg_manager() {
-    if command -v apt-get >/dev/null 2>&1; then
-        PKG_MGR="apt"
-    elif command -v dnf >/dev/null 2>&1; then
-        PKG_MGR="dnf"
-    elif command -v pacman >/dev/null 2>&1; then
-        PKG_MGR="pacman"
-    else
-        PKG_MGR="unknown"
-    fi
-}
-
-remove_hook() {
-    case "$PKG_MGR" in
-        apt)
-            rm -f /etc/apt/apt.conf.d/99fix-opera
-            ;;
-        pacman)
-            rm -f /usr/share/libalpm/hooks/fix-opera.hook
-            ;;
-        dnf)
-            rm -f /etc/dnf/plugins/post-transaction-actions.d/fix-opera.action
-            ;;
-        *)
-            echo "No supported package manager hook to remove"
-            ;;
-    esac
-}
-
-detect_pkg_manager
-remove_hook
-
-# --- remove alias ---
-if [[ -f "$USER_HOME/.bashrc" ]]; then
-    sed -i '/alias fix-opera=.*Opera fix HTML5 media/d' "$USER_HOME/.bashrc"
-fi
-
-# --- remove installed files ---
-rm -rf "$INSTALL_PATH"
-
-echo "Opera Widevine fix has been removed."