diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index f1b884f5..07855f38 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -108,20 +108,20 @@ jobs: - name: copy package content run: cp -rf PugSharp/bin/Debug/net7.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp - name: build package - run: zip -r PugSharp_${PUGSHARPNETVER}.zip packagebuild/addons + run: zip -r PugSharp_$PUGSHARPNETVER.zip packagebuild/addons - name: replace version variable in meta files - run: sed -i 's|%%VERSION%%|${PUGSHARPNETVER}|g' ./release.json; + run: sed -i "s|%%VERSION%%|$PUGSHARPNETVER|g" ./release.json; - name: replace CounterStrikeSharpVersion variable in meta files - run: sed -i 's|%%COUNTERSTRIKESHARPVERSION%%|0.0.1|g' ./release.json; + run: sed -i "s|%%COUNTERSTRIKESHARPVERSION%%|0.0.1|g" ./release.json; - name: replace CS2VERSION variable in meta files - run: sed -i 's|%%CS2VERSION%%|1.39.6.5/13965 9842|g' ./release.json; + run: sed -i "s|%%CS2VERSION%%|1.39.6.5/13965 9842|g" ./release.json; - name: Release if: ${{ (startsWith(github.ref, 'refs/tags/v')) && !(contains(github.ref, '-beta')) }} uses: softprops/action-gh-release@v1 with: files: | ./release.json - ./PugSharp_${PUGSHARPNETVER}.zip + ./PugSharp_$PUGSHARPNETVER.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: pre Release @@ -131,7 +131,7 @@ jobs: prerelease: true files: | ./release.json - ./PugSharp_${PUGSHARPNETVER}.zip + ./PugSharp_$PUGSHARPNETVER.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: upload pre - pre release @@ -140,5 +140,5 @@ jobs: name: latest_pre_pre path: | ./release.json - ./PugSharp_${PUGSHARPNETVER}.zip + ./PugSharp_$PUGSHARPNETVER.zip retention-days: 10 diff --git a/Makefile b/Makefile index 1f41f114..9c7164cf 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,8 @@ +currentDir = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +userId = $(shell id -u) +groupId = $(shell id -g) + + build-and-copy: build copy @@ -5,6 +10,9 @@ build-and-copy: build copy build: dotnet publish -c debug +init-csserver: + + copy: rm PugSharp/bin/Debug/net7.0/publish/CounterStrikeSharp.API.dll cp -rf PugSharp/bin/Debug/net7.0/publish/* /home/volza/temp/cs2/cs2-data/game/csgo/addons/counterstrikesharp/plugins/PugSharp