Update 99fix-opera. Workaround for #28

added info about jq requirement

README.md

@@ -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
@@ -41,6 +43,20 @@
 
     `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
+if ! which curl > /dev/null; then
-	printf '\033[1mwget\033[0m package must be installed to run this script\n'
+	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
 

scripts/99fix-opera

@@ -1,2 +1,2 @@
-DPkg::Pre-Invoke {"stat -c %Z $(readlink -f $(which opera)) > /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 {"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::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 -ne $OLD_OPERA ]; then /root/.scripts/fix-opera.sh; fi; rm -f /tmp/opera.timestamp";};

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,12 +15,17 @@ if ! which unzip > /dev/null; then
 	exit 1
 fi
 
-if ! which wget > /dev/null; then
+if ! which curl > /dev/null; then
-	printf '\033[1mwget\033[0m package must be installed to run this script\n'
+	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_MAIN=$(curl -sL4 $FFMPEG_SRC_MAIN | jq -r '.[0].assets[0].browser_download_url')
-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_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

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