Merge pull request #13 from kaptcha0/patch-1

Update fix-opera.sh

scripts/fix-opera.sh

@@ -30,81 +30,96 @@ 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"
-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
+if [ -x "$(command -v opera)" ]; then
-printf 'Getting download links...\n'
+  OPERA_VERSIONS+="opera"
-##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)
-[[ $(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
 fi
 
-##Widevine
+if [ -x "$(command -v opera-beta)" ]; then
-if $FIX_WIDEVINE; then
+  OPERA_VERSIONS+="opera-beta"
-	readonly WIDEVINE_LATEST=`wget -q4O - $WIDEVINE_VERSIONS | tail -n1`
-	readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip"
 fi
 
-#Downloading files
+for opera in ${OPERA_VERSIONS[@]}; do
-printf 'Downloading files...\n'
+  echo "Doing $opera"
-mkdir -p "$TEMP_DIR/opera-fix"
+  EXECUTABLE=$(command -v "$opera")
-##ffmpeg
-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'
-	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'
-		exit 1
-	fi
-fi
 
-#Extracting files
+  readonly OPERA_DIR=$(dirname $(readlink -f $EXECUTABLE))
-printf 'Extracting files...\n'
+  readonly OPERA_LIB_DIR="$OPERA_DIR/lib_extra"
-##ffmpeg
+  readonly OPERA_WIDEVINE_DIR="$OPERA_LIB_DIR/WidevineCdm"
-unzip -o "$TEMP_DIR/opera-fix/ffmpeg.zip" -d $TEMP_DIR/opera-fix > /dev/null
+  readonly OPERA_WIDEVINE_SO_DIR="$OPERA_WIDEVINE_DIR/_platform_specific/linux_x64"
-##Widevine
+  readonly OPERA_WIDEVINE_CONFIG="$OPERA_DIR/resources/widevine_config.json"
-if $FIX_WIDEVINE; then
-	unzip -o "$TEMP_DIR/opera-fix/widevine.zip" -d $TEMP_DIR/opera-fix > /dev/null
-fi
 
-#Removing old libraries and preparing directories
+  #Getting download links
-printf 'Removing old libraries & making directories...\n'
+  printf 'Getting download links...\n'
-##ffmpeg
+  ##ffmpeg
-rm -f "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
+  readonly FFMPEG_URL_MAIN=$(wget -q4O - $FFMPEG_SRC_MAIN | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
-mkdir -p "$OPERA_LIB_DIR"
+  readonly FFMPEG_URL_ALT=$(wget -q4O - $FFMPEG_SRC_ALT | grep browser_download_url | cut -d '"' -f 4 | grep linux-x64 | head -n 1)
-##Widevine
+  [[ $(basename $FFMPEG_URL_ALT) < $(basename $FFMPEG_URL_MAIN) ]] && readonly FFMPEG_URL=$FFMPEG_URL_MAIN || readonly FFMPEG_URL=$FFMPEG_URL_ALT
-if $FIX_WIDEVINE; then
+  if [[ -z $FFMPEG_URL ]]; then
-	rm -rf "$OPERA_WIDEVINE_DIR"
+    printf 'Failed to get ffmpeg download URL. Exiting...\n'
-	mkdir -p "$OPERA_WIDEVINE_SO_DIR"
+    exit 1
-fi
+  fi
 
-#Moving libraries to its place
+  ##Widevine
-printf 'Moving libraries to their places...\n'
+  if $FIX_WIDEVINE; then
-##ffmpeg
+    readonly WIDEVINE_LATEST=`wget -q4O - $WIDEVINE_VERSIONS | tail -n1`
-mv -f "$TEMP_DIR/opera-fix/$FFMPEG_SO_NAME" "$OPERA_LIB_DIR"
+    readonly WIDEVINE_URL="https://dl.google.com/widevine-cdm/$WIDEVINE_LATEST-linux-x64.zip"
-chmod 0644 "$OPERA_LIB_DIR/$FFMPEG_SO_NAME"
+  fi
-##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
+  #Downloading files
-printf 'Removing temporary files...\n'
+  printf 'Downloading files...\n'
-rm -rf "$TEMP_DIR/opera-fix"
+  mkdir -p "$TEMP_DIR/$opera-fix"
+  ##ffmpeg
+  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'
+    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'
+      exit 1
+    fi
+  fi
+
+  #Extracting files
+  printf 'Extracting files...\n'
+  ##ffmpeg
+  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
+  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
+  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 "$TEMP_DIR/$opera-fix"
+done