Merge branch 'master' into update-ffmpeg

.github/workflows/shell.yaml

@@ -59,7 +59,7 @@ jobs:
           git clone https://github.com/iina/iina
           bash ./iina/other/download_libs.sh
           export MPV_BIN_PATH=$(pwd)/deps
-          ( cd $MPV_BIN_PATH/lib && ln -s libmpv.1.dylib libmpv.dylib )
+          ( cd $MPV_BIN_PATH/lib && ln -s libmpv.2.dylib libmpv.dylib )
           export OPENSSL_BIN_PATH=$(brew --prefix openssl)
           mkdir build
           ( cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_RULE_MESSAGES:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. && make --no-print-directory )
@@ -81,7 +81,7 @@ jobs:
         env:
           TAG: master 
         run: |
-          curl https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v$SHELL_VERSION/server.js > $DEST_DIR/server.js
+          curl $(cat ./server-url.txt) > $DEST_DIR/server.js
           
       - name: Fix dependencies
         run: |

appveyor.yml

@@ -105,10 +105,8 @@ test_script:
   - copy "%FFMPEG_BIN_PATH%\*.dll" dist-win
   # copy-windows-node (stremio-runtime)
   - ps: '& $(Join-Path $env:DLL_DIR "generate_stremio-runtime.cmd") dist-win'
-  # copy-windows-server
-  - appveyor DownloadFile https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v%package_version%/server.js -FileName dist-win\server.js
-  # Patch server.js in order to work with node 14
-  - ps: ((Get-Content -path .\dist-win\server.js -Raw) -replace 'os.tmpDir','os.tmpdir') | Set-Content -Path .\dist-win\server.js
+  # Download and patch server.js in order to work with node 14
+  - ps: ((Invoke-WebRequest -Uri (Get-Content -path ./server-url.txt)).Content -replace  'os.tmpDir','os.tmpdir') | Set-Content -Path .\dist-win\server.js
   # copy-windows-ds
   - copy "%DS_BIN_PATH%\DS.exe" dist-win
   - copy "%DS_BIN_PATH%\Microsoft.Search.Interop.dll" dist-win

mac/finalize.sh

@@ -21,5 +21,5 @@ cp ./deps/libmpv/mac/lib/*.dylib ./stremio.app/Contents/Frameworks/
 macdeployqt ./stremio.app -executable=./stremio.app/Contents/MacOS/ffmpeg -executable=./stremio.app/Contents/MacOS/ffprobe -executable=./stremio.app/Contents/MacOS/node
 
 SHELL_VERSION=$(git grep -hoP '^\s*VERSION\s*=\s*\K.*$' HEAD -- stremio.pro)
-curl https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v$SHELL_VERSION/server.js > $DEST_DIR/server.js
+curl $(cat ./server-url.txt) > $DEST_DIR/server.js
 # ./mac/fix_osx_deps.sh "./stremio.app/Contents/Frameworks" "@executable_path/../Frameworks"

release.makefile

@@ -29,7 +29,7 @@ icons:
 	cd "$@" && printf 16,22,24,32,64,128 | xargs -I^ -d, sh -c 'rsvg-convert ../images/stremio.svg -w ^ -o smartcode-stremio_^.png && rsvg-convert ../images/stremio_tray_white.svg -w ^ -o smartcode-stremio-tray_^.png'
 
 ${SERVER_JS}: 
-	wget "https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v$(shell ./dist-utils/common/get-version.sh)/server.js" -qO ${SERVER_JS} || rm ${SERVER_JS}
+	wget "${shell cat server-url.txt}" -qO ${SERVER_JS} || rm ${SERVER_JS}
 
 ${STREMIO_BIN}:
 	mkdir -p ${BUILD_DIR}

server-url.txt

@@ -0,0 +1 @@
+https://dl.strem.io/server/v4.20.1/desktop/server.js