diff --git a/scripts/gha/deps_apple.sh b/scripts/gha/deps_apple.sh index 29e86094..45ce2ef1 100755 --- a/scripts/gha/deps_apple.sh +++ b/scripts/gha/deps_apple.sh @@ -1,8 +1,8 @@ #!/bin/bash -cd $GITHUB_WORKSPACE +cd "$GITHUB_WORKSPACE" || exit 1 -wget https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.dmg -O SDL2.dmg +wget "https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.dmg" -O SDL2.dmg hdiutil mount SDL2.dmg sudo cp -vr /Volumes/SDL2/SDL2.framework /Library/Frameworks diff --git a/scripts/gha/deps_ios.sh b/scripts/gha/deps_ios.sh index 6aa6bb42..478c7fae 100644 --- a/scripts/gha/deps_ios.sh +++ b/scripts/gha/deps_ios.sh @@ -1,13 +1,13 @@ #!/bin/bash -cd $GITHUB_WORKSPACE +cd "$GITHUB_WORKSPACE" || exit 1 -git clone https://github.com/libsdl-org/SDL -b release-$SDL_VERSION +git clone https://github.com/libsdl-org/SDL -b "release-$SDL_VERSION" -cd SDL/Xcode/SDL +cd SDL/Xcode/SDL || exit 1 xcodebuild -scheme xcFramework-iOS -target xcFramework-iOS build -configuration Release sudo cp -vr Products/SDL2.xcframework/ios-arm64/SDL2.framework /Library/Frameworks -cd $GITHUB_WORKSPACE +cd "$GITHUB_WORKSPACE" || exit 1 git clone https://github.com/FWGS/hlsdk-portable hlsdk -b mobile_hacks --depth=1 diff --git a/scripts/gha/deps_linux.sh b/scripts/gha/deps_linux.sh index 75c3cb9f..bcdb46fe 100755 --- a/scripts/gha/deps_linux.sh +++ b/scripts/gha/deps_linux.sh @@ -86,8 +86,8 @@ if [ -n "${APPIMAGETOOL[$GH_CPU_ARCH]}" ]; then fi FFMPEG_ARCHIVE=$(get_ffmpeg_archive) -wget https://github.com/FWGS/FFmpeg-Builds/releases/download/latest/$FFMPEG_ARCHIVE.tar.xz -qO- | tar -xJf - -mv $FFMPEG_ARCHIVE ffmpeg +wget "https://github.com/FWGS/FFmpeg-Builds/releases/download/latest/$FFMPEG_ARCHIVE.tar.xz" -qO- | tar -xJf - +mv "$FFMPEG_ARCHIVE" ffmpeg wget "https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.tar.gz" -qO- | tar -xzf - mv "SDL2-$SDL_VERSION" SDL2_src diff --git a/scripts/gha/deps_motomagx.sh b/scripts/gha/deps_motomagx.sh index d3771689..b916d793 100755 --- a/scripts/gha/deps_motomagx.sh +++ b/scripts/gha/deps_motomagx.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd $GITHUB_WORKSPACE +cd "$GITHUB_WORKSPACE" || exit 1 sudo dpkg --add-architecture i386 sudo apt update @@ -8,8 +8,8 @@ sudo apt install libc6:i386 libstdc++6:i386 gcc-multilib g++-multilib p7zip-full sudo mkdir -p /opt/toolchains -pushd /opt/toolchains/ +pushd /opt/toolchains/ || exit 1 sudo git clone https://github.com/a1batross/motomagx_toolchain motomagx --depth=1 -popd +popd || exit 1 git clone https://github.com/FWGS/hlsdk-xash3d hlsdk -b mobile_hacks --depth=1 diff --git a/scripts/gha/deps_nswitch.sh b/scripts/gha/deps_nswitch.sh index 7f7933f6..c0b02c00 100644 --- a/scripts/gha/deps_nswitch.sh +++ b/scripts/gha/deps_nswitch.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd $GITHUB_WORKSPACE +cd "$GITHUB_WORKSPACE" || exit 1 echo "Downloading devkitA64 docker container..." diff --git a/scripts/gha/deps_psvita.sh b/scripts/gha/deps_psvita.sh index 6b8ca3de..1e922c1e 100644 --- a/scripts/gha/deps_psvita.sh +++ b/scripts/gha/deps_psvita.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd $GITHUB_WORKSPACE +cd "$GITHUB_WORKSPACE" || exit 1 # pinning cmake version to 3.28.3, because with cmake 4.x SDL vita fork doesn't building # it is known problem and cmake 4.x update breaks many CI pipelines around the world :) @@ -16,11 +16,11 @@ VITAGL_SRCREV="4d3ab1053424abe3b2164a50d15c5e355e33ed99" # lock vitaGL version t install_package() { - ./vdpm $1 || exit 1 + ./vdpm "$1" || exit 1 } git clone https://github.com/vitasdk/vdpm.git --depth=1 || exit 1 -pushd vdpm +pushd vdpm || exit 1 ./bootstrap-vitasdk.sh || exit 1 install_package taihen install_package kubridge @@ -28,14 +28,14 @@ install_package zlib install_package SceShaccCgExt install_package vitaShaRK install_package libmathneon -popd +popd || exit 1 echo "Downloading vitaGL..." git clone https://github.com/Rinnegatamante/vitaGL.git || exit 1 -pushd vitaGL +pushd vitaGL || exit 1 git checkout $VITAGL_SRCREV || exit 1 -popd +popd || exit 1 echo "Downloading vitaGL fork of SDL2..." diff --git a/scripts/gha/deps_win32.sh b/scripts/gha/deps_win32.sh index ae38c5d1..26a55248 100755 --- a/scripts/gha/deps_win32.sh +++ b/scripts/gha/deps_win32.sh @@ -2,9 +2,9 @@ . scripts/lib.sh -curl -L http://libsdl.org/release/SDL2-devel-$SDL_VERSION-VC.zip -o SDL2.zip +curl -L "http://libsdl.org/release/SDL2-devel-$SDL_VERSION-VC.zip" -o SDL2.zip unzip -q SDL2.zip -mv SDL2-$SDL_VERSION SDL2_VC +mv "SDL2-$SDL_VERSION" SDL2_VC if [ "$GH_CPU_ARCH" = "i386" ]; then rustup target add i686-pc-windows-msvc @@ -17,8 +17,8 @@ rm pkgconf.tar* mv mingw64 pkgconf FFMPEG_ARCHIVE=$(get_ffmpeg_archive) -curl -L https://github.com/FWGS/FFmpeg-Builds/releases/download/latest/$FFMPEG_ARCHIVE.zip -o ffmpeg.zip +curl -L "https://github.com/FWGS/FFmpeg-Builds/releases/download/latest/$FFMPEG_ARCHIVE.zip" -o ffmpeg.zip if [ -f ffmpeg.zip ]; then unzip -x ffmpeg.zip - mv $FFMPEG_ARCHIVE ffmpeg + mv "$FFMPEG_ARCHIVE" ffmpeg fi