ci: update nsp forwarder cmakefile

README.md

@@ -272,7 +272,7 @@ cmake --build build
 
 ```shell
 docker run --rm -v $(pwd):/data devkitpro/devkita64:20230622 \
- sh -c "/data/scripts/build_switch.sh"
+ bash -c "/data/scripts/build_switch.sh"
 ```
 
 #### 本地编译

scripts/build_switch.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 BUILD_DIR=cmake-build-switch
@@ -14,7 +15,11 @@ PKGS=(
  "switch-libmpv-0.35.1-1-any.pkg.tar.zst"
  "switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
 )
-for PKG in "${PKGS[@]}"; do dkp-pacman -U --noconfirm ${BASE_URL}${PKG}; done
+for PKG in "${PKGS[@]}"; do
+ [ -f "${PKG}" ] || curl -LO ${BASE_URL}${PKG}
+ dkp-pacman -U --noconfirm ${PKG}
+done
+
 curl -sL https://github.com/dragonflylee/hacBrewPack/releases/download/v3.06/hacbrewpack-v3.06_linux-amd64.tar.gz | tar zxf - -C /usr/local/bin
 
 cmake -B ${BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILTIN_NSP=ON -DPLATFORM_SWITCH=ON

scripts/switch-forwarder/CMakeLists.txt

@@ -25,9 +25,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE VERSION="2.4.3")
 
 if (NOT PROJECT_KEYSET)
  SET(PROJECT_KEYSET "${PROJECT_BINARY_DIR}/prod.keys")
- add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
- COMMAND curl -Lo ${PROJECT_KEYSET} https://raw.githubusercontent.com/ZeeWanderer/s/master/prod.keys
- )
+ file(DOWNLOAD https://raw.githubusercontent.com/externalEmu/s/master/prod.keys ${PROJECT_KEYSET})
 endif ()
 
 add_custom_target(${PROJECT_NAME}.pfs0 DEPENDS ${PROJECT_NAME}
@@ -37,9 +35,10 @@ add_custom_target(${PROJECT_NAME}.pfs0 DEPENDS ${PROJECT_NAME}
 )
 
 add_custom_target(${PROJECT_NAME}.nsp DEPENDS ${PROJECT_NAME}.pfs0
- COMMAND ${CMAKE_COMMAND} -E make_directory "${PROJECT_BINARY_DIR}/control"
- COMMAND ${NX_NACPTOOL_EXE} --create "${PROJECT_NAME}" "${PROJECT_AUTHOR}" "${APP_VERSION}" "${PROJECT_BINARY_DIR}/control/control.nacp"
- COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_ICON}" "${PROJECT_BINARY_DIR}/control/icon_AmericanEnglish.dat"
- COMMAND ${HACBREWPACK_EXE} -k "${PROJECT_KEYSET}" --titleid ${PROJECT_TITLEID} --titlename ${CMAKE_PROJECT_NAME} --noromfs --nologo
+ COMMAND ${CMAKE_COMMAND} -E make_directory "control" "logo"
+ COMMAND ${NX_NACPTOOL_EXE} --create "${PROJECT_NAME}" "${PROJECT_AUTHOR}" "${APP_VERSION}" "control/control.nacp"
+ COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_RESOURCES}/icon/logo.png" "logo/NintendoLogo.png"
+ COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_ICON}" "control/icon_AmericanEnglish.dat"
+ COMMAND ${HACBREWPACK_EXE} -k "${PROJECT_KEYSET}" --titleid ${PROJECT_TITLEID} --titlename ${CMAKE_PROJECT_NAME} --noromfs
  COMMAND ${CMAKE_COMMAND} -E rename "hacbrewpack_nsp/${PROJECT_TITLEID}.nsp" "${PROJECT_RESOURCES}/${PROJECT_NAME}.nsp"
 )