Merge pull request #36 from valdineidossantos/fix_jq_syntax

fix: correct jq syntax for fetching latest ffmpeg release URLs

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

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
 

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.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,18 +15,23 @@ 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 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
 
 #Config section
 readonly FIX_WIDEVINE=true
-readonly TEMP_DIR='/tmp'
+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'
@@ -46,9 +51,10 @@ 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_ALT=$(wget -q4O - $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'
@@ -56,36 +62,56 @@ if [[ -z $FFMPEG_URL ]]; then
 fi
 
 ##Widevine
-if $FIX_WIDEVINE; then
-  readonly WIDEVINE_LATEST=`wget -q4O - $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 -q4 --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 -q4 --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'
+if $FIX_WIDEVINE; then
+  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
@@ -115,13 +141,13 @@ for opera in ${OPERA_VERSIONS[@]}; do
   #Moving libraries to its place
   printf 'Moving libraries to their places...\n'
   ##ffmpeg
-  cp -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
-    cp -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"
-    cp -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
@@ -129,4 +155,4 @@ done
 
 #Removing temporary files
 printf 'Removing temporary files...\n'
-rm -rf "$TEMP_DIR/opera-fix"
+rm -rf "$FIX_DIR"