From 00fba90928cbf8004c34bf9f75ffb916acab64fa Mon Sep 17 00:00:00 2001 From: JustArchi Date: Thu, 14 Jan 2021 11:03:42 +0100 Subject: [PATCH] Misc STD enhancements in cc.sh --- cc.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cc.sh b/cc.sh index c1b9cef7d..0b8a69d7e 100755 --- a/cc.sh +++ b/cc.sh @@ -116,7 +116,7 @@ fi dotnet publish "$MAIN_PROJECT" -o "$OUT_ASF" $DOTNET_FLAGS -if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ]; then +if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" ] && command -v git >/dev/null; then git checkout -- "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" sed "s/STEAM_TOKEN_DUMPER_TOKEN/${STEAM_TOKEN_DUMPER_TOKEN}/g" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" > "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs.new"; mv "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs.new" "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" @@ -124,10 +124,11 @@ if [ -n "${STEAM_TOKEN_DUMPER_TOKEN-}" ] && [ -f "${STEAM_TOKEN_DUMPER_NAME}/Sha dotnet publish "$STEAM_TOKEN_DUMPER_NAME" -o "$OUT_STD" $DOTNET_FLAGS git checkout -- "${STEAM_TOKEN_DUMPER_NAME}/SharedInfo.cs" + rm -rf "${OUT_ASF}/plugins/${STEAM_TOKEN_DUMPER_NAME}" mkdir -p "${OUT_ASF}/plugins/${STEAM_TOKEN_DUMPER_NAME}" - cp "${OUT_STD}/${STEAM_TOKEN_DUMPER_NAME}.dll" "${OUT_ASF}/plugins/${STEAM_TOKEN_DUMPER_NAME}" + cp -pR "${OUT_STD}/"* "${OUT_ASF}/plugins/${STEAM_TOKEN_DUMPER_NAME}" else - echo "WARNING: STEAM_TOKEN_DUMPER_TOKEN is missing, skipping build of ${STEAM_TOKEN_DUMPER_NAME}..." + echo "WARNING: ${STEAM_TOKEN_DUMPER_NAME} dependencies are missing, skipping build of ${STEAM_TOKEN_DUMPER_NAME}..." fi echo