From bd0d1d9022c92b38e209fba7e27a14786033561b Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Tue, 28 Jan 2025 19:07:43 -0600 Subject: [PATCH] windows msi fix --- .github/workflows/generator-windows.yml | 6 ++++-- .github/workflows/pre137-generator-windows.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 3f242ac..8a1862e 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -542,8 +542,10 @@ jobs: continue-on-error: true if: env.UPLOAD_ARTIFACT == 'true' run: | - $myappname = "${{ inputs.appname }}" -replace '\s','_' - cp "rustdesk/${{ inputs.appname }}.exe" "rustdesk/${myappname}.exe" || true + if [ "${{ inputs.appname }}" != "rustdesk" ] + $myappname = "${{ inputs.appname }}" -replace '\s','_' + cp "rustdesk/${{ inputs.appname }}.exe" "rustdesk/${myappname}.exe" + fi pushd ./res/msi python preprocess.py --app-name "$myappname" --arp -d ../../rustdesk nuget restore msi.sln diff --git a/.github/workflows/pre137-generator-windows.yml b/.github/workflows/pre137-generator-windows.yml index 0e2beea..e8f14e9 100644 --- a/.github/workflows/pre137-generator-windows.yml +++ b/.github/workflows/pre137-generator-windows.yml @@ -540,8 +540,10 @@ jobs: continue-on-error: true if: env.UPLOAD_ARTIFACT == 'true' run: | - $myappname = "${{ inputs.appname }}" -replace '\s','_' - cp "rustdesk/${{ inputs.appname }}.exe" "rustdesk/${myappname}.exe" + if [ "${{ inputs.appname }}" != "rustdesk" ] + $myappname = "${{ inputs.appname }}" -replace '\s','_' + cp "rustdesk/${{ inputs.appname }}.exe" "rustdesk/${myappname}.exe" + fi pushd ./res/msi python preprocess.py --app-name "$myappname" --arp -d ../../rustdesk nuget restore msi.sln