From da33c6f5fda1c23c9252da005d65a2fa38f4776f Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Thu, 13 Feb 2025 08:03:23 -0600 Subject: [PATCH] added company name --- .github/workflows/generator-linux.yml | 11 +++++++++-- .github/workflows/generator-windows.yml | 26 ++++++++++++++----------- rdgenerator/forms.py | 1 + rdgenerator/templates/generator.html | 2 ++ rdgenerator/views.py | 4 ++++ 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index 89848b1..5442bb6 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -277,8 +277,15 @@ jobs: sed -i -e 's|OriginalFilename = "rustdesk.exe"|OriginalFilename = "${{ inputs.appname }}.exe"|' ./libs/portable/Cargo.toml find ./src/lang -name "*.rs" -exec sed -i -e 's|RustDesk|${{ inputs.appname }}|' {} \; sed -i -e '/-p tmpdeb\/usr\/lib\/rustdesk/d' ./build.py - sed -i -e 's|Purslane Ltd.|${{ inputs.appname }}|' ./Cargo.toml - sed -i -e 's|Purslane Ltd|${{ inputs.appname }}|' ./libs/portable/Cargo.toml + + - name: change company name + if: fromJson(inputs.extras).compname != 'Purslane Ltd' + continue-on-error: true + shell: bash + run: | + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./flutter/lib/desktop/pages/desktop_setting_page.dart + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./Cargo.toml + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./libs/portable/Cargo.toml - name: allow custom.txt continue-on-error: true diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 0ec650e..b80f648 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -177,29 +177,33 @@ jobs: sed -i -e 's|ProductName = "RustDesk"|ProductName = "${{ inputs.appname }}"|' ./Cargo.toml sed -i -e 's|FileDescription = "RustDesk Remote Desktop"|FileDescription = "${{ inputs.appname }}"|' ./Cargo.toml sed -i -e 's|OriginalFilename = "rustdesk.exe"|OriginalFilename = "${{ inputs.appname }}.exe"|' ./Cargo.toml - sed -i -e 's|Purslane Ltd|${{ inputs.appname }}|' ./Cargo.toml # ./libs/portable/Cargo.toml sed -i -e 's|description = "RustDesk Remote Desktop"|description = "${{ inputs.appname }}"|' ./libs/portable/Cargo.toml sed -i -e 's|ProductName = "RustDesk"|ProductName = "${{ inputs.appname }}"|' ./libs/portable/Cargo.toml sed -i -e 's|FileDescription = "RustDesk Remote Desktop"|FileDescription = "${{ inputs.appname }}"|' ./libs/portable/Cargo.toml sed -i -e 's|OriginalFilename = "rustdesk.exe"|OriginalFilename = "${{ inputs.appname }}.exe"|' ./libs/portable/Cargo.toml - sed -i -e 's|Purslane Ltd|${{ inputs.appname }}|' ./libs/portable/Cargo.toml # ./flutter/windows/runner/Runner.rc sed -i -e 's|"RustDesk Remote Desktop"|"${{ inputs.appname }}"|' ./flutter/windows/runner/Runner.rc sed -i -e 's|VALUE "InternalName", "rustdesk" "\0"|VALUE "InternalName", "${{ inputs.appname }}" "\0"|' ./flutter/windows/runner/Runner.rc - sed -i -e 's|"Copyright © 2025 Purslane Ltd. All rights reserved."|"Copyright © 2025"|' ./flutter/windows/runner/Runner.rc - sed -i -e 's|Purslane Ltd|${{ inputs.appname }}|' ./flutter/windows/runner/Runner.rc sed -i -e 's|"rustdesk.exe"|"${{ inputs.filename }}"|' ./flutter/windows/runner/Runner.rc sed -i -e 's|"RustDesk"|"${{ inputs.appname }}"|' ./flutter/windows/runner/Runner.rc # ./src/lang/en.rs find ./src/lang -name "*.rs" -exec sed -i -e 's|RustDesk|${{ inputs.appname }}|' {} \; - # ./flutter/lib/desktop/pages/desktop_setting_page.dart - sed -i -e 's|Purslane Ltd|${{ inputs.appname }}|' ./flutter/lib/desktop/pages/desktop_setting_page.dart - #./res/setup.nsi - sed -i -e 's|Purslane Ltd.|${{ inputs.appname }}|' ./res/setup.nsi - #./res/msi/preprocess.py - sed -i -e 's|PURSLANE|${{ inputs.appname }}|' ./res/msi/preprocess.py - sed -i -e 's|Purslane Ltd|${{ inputs.appname }}|' ./res/msi/preprocess.py + + + - name: change company name + if: fromJson(inputs.extras).compname != 'Purslane Ltd' + continue-on-error: true + shell: bash + run: | + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./flutter/lib/desktop/pages/desktop_setting_page.dart + sed -i -e 's|Purslane Ltd.|${{ fromJson(inputs.extras).compname }}|' ./res/setup.nsi + sed -i -e 's|PURSLANE|${{ fromJson(inputs.extras).compname }}|' ./res/msi/preprocess.py + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./res/msi/preprocess.py + sed -i -e 's|"Copyright © 2025 Purslane Ltd. All rights reserved."|"Copyright © 2025 ${{ fromJson(inputs.extras).compname }}. All rights reserved."|' ./flutter/windows/runner/Runner.rc + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./flutter/windows/runner/Runner.rc + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./Cargo.toml + sed -i -e 's|Purslane Ltd|${{ fromJson(inputs.extras).compname }}|' ./libs/portable/Cargo.toml - name: change url to custom if: fromJson(inputs.extras).urlLink != 'https://rustdesk.com' diff --git a/rdgenerator/forms.py b/rdgenerator/forms.py index f25c062..959d98e 100644 --- a/rdgenerator/forms.py +++ b/rdgenerator/forms.py @@ -29,6 +29,7 @@ class GenerateForm(forms.Form): key = forms.CharField(label="Key", required=False) urlLink = forms.CharField(label="Custom URL for links", required=False) downloadLink = forms.CharField(label="Custom URL for downloading new versions", required=False) + compname = forms.CharField(label="Company name",require=False) #Visual iconfile = forms.FileField(label="Custom App Icon (in .png format)", required=False, widget=forms.FileInput(attrs={'accept': 'image/png'})) diff --git a/rdgenerator/templates/generator.html b/rdgenerator/templates/generator.html index d3df31a..139d4a8 100644 --- a/rdgenerator/templates/generator.html +++ b/rdgenerator/templates/generator.html @@ -183,6 +183,8 @@ {{ form.urlLink }}

{{ form.downloadLink }}

+ + {{ form.compname }}

diff --git a/rdgenerator/views.py b/rdgenerator/views.py index 80f41b0..ea6e38a 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -48,6 +48,9 @@ def generator_view(request): settings = form.cleaned_data['settings'] appname = form.cleaned_data['appname'] filename = form.cleaned_data['exename'] + compname = form.cleaned_data['compname'] + if not compname: + compname = "Purslane Ltd" permPass = form.cleaned_data['permanentPassword'] theme = form.cleaned_data['theme'] themeDorO = form.cleaned_data['themeDorO'] @@ -170,6 +173,7 @@ def generator_view(request): extras['hidecm'] = 'true' if hidecm else 'false' extras['statussort'] = 'true' if statussort else 'false' extras['removeNewVersionNotif'] = 'true' if removeNewVersionNotif else 'false' + extras['compname'] = compname extra_input = json.dumps(extras) ####from here run the github action, we need user, repo, access token.