Skip to content

Commit 963837d

Browse files
committed
image stuff
1 parent 9034535 commit 963837d

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

.github/workflows/generator-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ jobs:
295295
run: |
296296
#mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
297297
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
298+
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/scalable.svg
298299
299300
- uses: rustdesk-org/run-on-arch-action@amd64-support
300301
name: Build rustdesk

.github/workflows/generator-windows.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ jobs:
148148
repository: rustdesk/rustdesk
149149
ref: refs/tags/${{ env.VERSION }}
150150

151+
- name: Install wget
152+
run: |
153+
choco install wget -y
154+
151155
# - name: Install ImageMagick on Windows
152156
# run: |
153157
# choco install -y imagemagick.app --no-progress
@@ -217,13 +221,13 @@ jobs:
217221
mv ./res/icon.ico ./res/icon.ico.bak
218222
mv ./res/icon.png ./res/icon.png.bak
219223
mv ./res/tray-icon.ico ./res/tray-icon.ico.bak
220-
#echo "${{ inputs.iconbase64 }}" | base64 -d > ./res/icon.png
221-
wget -O ./res/icon.png ${{ inputs.iconlink }}
224+
#echo "${{ inputs.iconbase64 }}" | base64 -d > ./res/icon.png
222225
223226
- name: magick stuff
224227
if: ${{ inputs.iconlink != 'false' }}
225228
continue-on-error: true
226229
run: |
230+
wget -O ./res/icon.png ${{ inputs.iconlink }}
227231
mv ./res/32x32.png ./res/32x32.png.bak
228232
mv ./res/64x64.png ./res/64x64.png.bak
229233
mv ./res/128x128.png ./res/128x128.png.bak
@@ -329,18 +333,19 @@ jobs:
329333
python .\build.py --portable --flutter --skip-portable-pack
330334
mv ./flutter/build/windows/x64/runner/Release ./rustdesk
331335
332-
- name: logo stuff
333-
if: ${{ inputs.logolink != 'false' }}
334-
continue-on-error: true
335-
shell: bash
336-
run: |
337-
#echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png
338-
wget -O ./rustdesk/data/flutter_assets/assets/logo.png ${{ inputs.logolink }}
336+
# - name: logo stuff
337+
# if: ${{ inputs.logolink != 'false' }}
338+
# continue-on-error: true
339+
# shell: bash
340+
# run: |
341+
# #echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png
342+
339343

340344
- name: icon stuff
341345
if: ${{ inputs.iconlink != 'false' }}
342346
continue-on-error: true
343347
run: |
348+
wget -O ./rustdesk/data/flutter_assets/assets/logo.png ${{ inputs.logolink }}
344349
mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
345350
magick ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
346351

rdgen/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
# SECURITY WARNING: don't run with debug turned on in production!
32-
DEBUG = True
32+
DEBUG = False
3333

3434
ALLOWED_HOSTS = ['*']
3535

0 commit comments

Comments
 (0)