Fixed Arch system check

Fix for arch based systems

scripts/fix-opera.sh

@@ -20,55 +20,63 @@ if ! which wget > /dev/null; then
 	exit 1
 fi
 
+if which pacman > /dev/null; then
+	ARCH_SYSTEM=true
+fi
+
 #Config section
 readonly FIX_WIDEVINE=true
 readonly TEMP_DIR='/tmp'
-readonly FFMPEG_SRC_MAIN='https://api.github.com/repos/iteufel/nwjs-ffmpeg-prebuilt/releases'
+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'
 readonly FFMPEG_SO_NAME='libffmpeg.so'
 readonly WIDEVINE_SO_NAME='libwidevinecdm.so'
 readonly WIDEVINE_MANIFEST_NAME='manifest.json'
 
-readonly OPERA_DIR=$(dirname $(readlink -f $(which opera)))
+OPERA_VERSIONS=()
-readonly OPERA_LIB_DIR="$OPERA_DIR/lib_extra"
+
-readonly OPERA_WIDEVINE_DIR="$OPERA_LIB_DIR/WidevineCdm"
+if [ -x "$(command -v opera)" ]; then
-readonly OPERA_WIDEVINE_SO_DIR="$OPERA_WIDEVINE_DIR/_platform_specific/linux_x64"
+  OPERA_VERSIONS+=("opera")
-readonly OPERA_WIDEVINE_CONFIG="$OPERA_DIR/resources/widevine_config.json"
+fi
+
+if [ -x "$(command -v opera-beta)" ]; then
+  OPERA_VERSIONS+=("opera-beta")
+fi
 
 #Getting download links
 printf 'Getting download links...\n'
 ##ffmpeg
-#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_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 -qO - $FFMPEG_SRC_ALT | 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)
 [[ $(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'
+  printf 'Failed to get ffmpeg download URL. Exiting...\n'
-	exit 1
+  exit 1
 fi
 
 ##Widevine
 if $FIX_WIDEVINE; then
-	readonly WIDEVINE_LATEST=`wget -qO - $WIDEVINE_VERSIONS | tail -n1`
+  readonly WIDEVINE_LATEST=`wget -q4O - $WIDEVINE_VERSIONS | tail -n1`
-	readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip"
+  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"
 ##ffmpeg
-wget -q --show-progress $FFMPEG_URL -O "$TEMP_DIR/opera-fix/ffmpeg.zip"
+wget -q4 --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'
+  printf 'Failed to download ffmpeg. Check your internet connection or try later\n'
-	exit 1
+  exit 1
 fi
 ##Widevine
 if $FIX_WIDEVINE;  then
-	wget -q --show-progress "$WIDEVINE_URL" -O "$TEMP_DIR/opera-fix/widevine.zip"
+  wget -q4 --show-progress "$WIDEVINE_URL" -O "$TEMP_DIR/opera-fix/widevine.zip"
-	if [ $? -ne 0 ]; then
+  if [ $? -ne 0 ]; then
-		printf 'Failed to download Widevine CDM. Check your internet connection or try later\n'
+    printf 'Failed to download Widevine CDM. Check your internet connection or try later\n'
-		exit 1
+    exit 1
-	fi
+  fi
 fi
 
 #Extracting files
@@ -77,33 +85,47 @@ printf 'Extracting files...\n'
 unzip -o "$TEMP_DIR/opera-fix/ffmpeg.zip" -d $TEMP_DIR/opera-fix > /dev/null
 ##Widevine
 if $FIX_WIDEVINE; then
-	unzip -o "$TEMP_DIR/opera-fix/widevine.zip" -d $TEMP_DIR/opera-fix > /dev/null
+  unzip -o "$TEMP_DIR/opera-fix/widevine.zip" -d $TEMP_DIR/opera-fix > /dev/null
 fi
 
-#Removing old libraries and preparing directories
+for opera in ${OPERA_VERSIONS[@]}; do
-printf 'Removing old libraries & making directories...\n'
+  echo "Doing $opera"
-##ffmpeg
+  EXECUTABLE=$(command -v "$opera")
-rm -f "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
+	if [[ "$ARCH_SYSTEM" == true ]]; then
-mkdir -p "$OPERA_LIB_DIR"
+		OPERA_DIR=$(dirname $(cat $EXECUTABLE | grep exec | cut -d ' ' -f 2))
-##Widevine
+	else
-if $FIX_WIDEVINE; then
+		OPERA_DIR=$(dirname $(readlink -f $EXECUTABLE))
-	rm -rf "$OPERA_WIDEVINE_DIR"
+	fi
-	mkdir -p "$OPERA_WIDEVINE_SO_DIR"
+  OPERA_LIB_DIR="$OPERA_DIR/lib_extra"
-fi
+  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"
 
-#Moving libraries to its place
+  #Removing old libraries and preparing directories
-printf 'Moving libraries to their places...\n'
+  printf 'Removing old libraries & making directories...\n'
-##ffmpeg
+  ##ffmpeg
-mv -f "$TEMP_DIR/opera-fix/$FFMPEG_SO_NAME" "$OPERA_LIB_DIR"
+  rm -f "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
-chmod 0644 "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
+  mkdir -p "$OPERA_LIB_DIR"
-##Widevine
+  ##Widevine
-if $FIX_WIDEVINE; then
+  if $FIX_WIDEVINE; then
-	mv -f "$TEMP_DIR/opera-fix/$WIDEVINE_SO_NAME" "$OPERA_WIDEVINE_SO_DIR"
+    rm -rf "$OPERA_WIDEVINE_DIR"
-	chmod 0644 "$OPERA_WIDEVINE_SO_DIR/$WIDEVINE_SO_NAME"
+    mkdir -p "$OPERA_WIDEVINE_SO_DIR"
-	mv -f "$TEMP_DIR/opera-fix/$WIDEVINE_MANIFEST_NAME" "$OPERA_WIDEVINE_DIR"
+  fi
-	chmod 0644 "$OPERA_WIDEVINE_DIR/$WIDEVINE_MANIFEST_NAME"
+
-	printf "[\n      {\n         \"preload\": \"$OPERA_WIDEVINE_DIR\"\n      }\n]\n" > "$OPERA_WIDEVINE_CONFIG"
+  #Moving libraries to its place
-fi
+  printf 'Moving libraries to their places...\n'
+  ##ffmpeg
+  cp -f "$TEMP_DIR/opera-fix/$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"
+    chmod 0644 "$OPERA_WIDEVINE_SO_DIR/$WIDEVINE_SO_NAME"
+    cp -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
+done
 
 #Removing temporary files
 printf 'Removing temporary files...\n'