From 7212c9490f51c72412f3ad7a661e0ab8fb187f1d Mon Sep 17 00:00:00 2001
From: fishyW <winstonwijaya88@gmail.com>
Date: Thu, 30 May 2024 22:33:17 +1000
Subject: [PATCH 1/4] wget compatibility + jq fix

---
 scripts/fix-opera.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/fix-opera.sh b/scripts/fix-opera.sh
index 7adf5ad..2517a41 100755
--- a/scripts/fix-opera.sh
+++ b/scripts/fix-opera.sh
@@ -47,8 +47,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_ALT=$(wget -q4O - $FFMPEG_SRC_ALT | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
+readonly FFMPEG_URL_MAIN=$(wget -q4O - $FFMPEG_SRC_MAIN | jq | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
+readonly FFMPEG_URL_ALT=$(wget -q4O - $FFMPEG_SRC_ALT | jq | 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'
@@ -65,14 +65,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"
+wget -q4 --progress=bar:force:noscroll $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"
+  wget -q4 --progress=bar:force:noscroll "$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

From 031316d313f96b22db77065e848e6f614b665c86 Mon Sep 17 00:00:00 2001
From: fishyW <winstonwijaya88@gmail.com>
Date: Thu, 30 May 2024 22:34:18 +1000
Subject: [PATCH 2/4] gets rid of which: no pacman message in non arch
 distributions

---
 scripts/fix-opera.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fix-opera.sh b/scripts/fix-opera.sh
index 2517a41..d05cfec 100755
--- a/scripts/fix-opera.sh
+++ b/scripts/fix-opera.sh
@@ -20,7 +20,7 @@ if ! which wget > /dev/null; then
 	exit 1
 fi
 
-if which pacman > /dev/null; then
+if which pacman &> /dev/null; then
 	ARCH_SYSTEM=true
 fi
 

From 2d5105a1293e4d69b75b2539b2018cfd3879b354 Mon Sep 17 00:00:00 2001
From: fishyW <winstonwijaya88@gmail.com>
Date: Thu, 30 May 2024 22:38:06 +1000
Subject: [PATCH 3/4] 'jq check

---
 install.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install.sh b/install.sh
index 9e8c36a..6165082 100755
--- a/install.sh
+++ b/install.sh
@@ -19,6 +19,11 @@ if ! which wget > /dev/null; then
 	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
+
 readonly SCRIPT_PATH=$(dirname $(readlink -f $0))
 readonly INSTALL_PATH="/root/.scripts"
 readonly USER_NAME="$(logname)"

From 3de916e3ea86fe6eaf846865de3408750157a798 Mon Sep 17 00:00:00 2001
From: fishyW <winstonwijaya88@gmail.com>
Date: Fri, 31 May 2024 13:49:48 +1000
Subject: [PATCH 4/4] replace jq with jq -r

---
 scripts/fix-opera.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/fix-opera.sh b/scripts/fix-opera.sh
index d05cfec..f8bc72b 100755
--- a/scripts/fix-opera.sh
+++ b/scripts/fix-opera.sh
@@ -47,8 +47,8 @@ fi
 #Getting download links
 printf 'Getting download links...\n'
 ##ffmpeg
-readonly FFMPEG_URL_MAIN=$(wget -q4O - $FFMPEG_SRC_MAIN | jq | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
-readonly FFMPEG_URL_ALT=$(wget -q4O - $FFMPEG_SRC_ALT | jq | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
+readonly FFMPEG_URL_MAIN=$(wget -q4O - $FFMPEG_SRC_MAIN | jq -r '.[0].assets[0].browser_download_url')
+readonly FFMPEG_URL_ALT=$(wget -q4O - $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'