From cf5e8f6e30c8395a4928afc48dfb7acfe516c93b Mon Sep 17 00:00:00 2001
From: Bryan Gerlach <bryan.r.gerlach@gmail.com>
Date: Wed, 16 Oct 2024 16:25:36 -0500
Subject: [PATCH] allow building from master

---
 .github/workflows/generator-android.yml | 16 ++++++++++++++--
 rdgenerator/templates/generator.html    |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml
index f374975..7ddbc27 100644
--- a/.github/workflows/generator-android.yml
+++ b/.github/workflows/generator-android.yml
@@ -442,9 +442,15 @@ jobs:
             cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/
             cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/librustdesk.so
             echo -n "${{ env.CUSTOM }}" | cat > ./flutter/assets/custom.txt
-            sed -i '/^    - assets\//a\    - assets/custom.txt' ./flutter/pubspec.yaml
+            #sed -i '/^    - assets\//a\    - assets/custom.txt' ./flutter/pubspec.yaml
             if [[ "${{ inputs.iconlink }}" != "false" ]]; then
+              mv ./flutter/assets/icon.svg ./flutter/assets/icon.svg.bak
               convert ./res/icon.png ./flutter/assets/icon.svg
+              convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png
+              convert ./res/icon.png ./res/scalable.svg
+              pushd ./flutter
+              flutter pub run flutter_launcher_icons
+              popd
             fi
             # build flutter
             pushd flutter
@@ -466,9 +472,15 @@ jobs:
               cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so ./flutter/android/app/src/main/jniLibs/x86_64/
               cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/x86_64/librustdesk.so
               echo -n "${{ env.CUSTOM }}" | cat > ./flutter/assets/custom.txt
-              sed -i '/^    - assets\//a\    - assets/custom.txt' ./flutter/pubspec.yaml
+              #sed -i '/^    - assets\//a\    - assets/custom.txt' ./flutter/pubspec.yaml
               if [[ "${{ inputs.iconlink }}" != "false" ]]; then
+                mv ./flutter/assets/icon.svg ./flutter/assets/icon.svg.bak
                 convert ./res/icon.png ./flutter/assets/icon.svg
+                convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png
+                convert ./res/icon.png ./res/scalable.svg
+                pushd ./flutter
+                flutter pub run flutter_launcher_icons
+                popd
               fi
               # build flutter
               pushd flutter
diff --git a/rdgenerator/templates/generator.html b/rdgenerator/templates/generator.html
index 6c49da3..aceee2d 100644
--- a/rdgenerator/templates/generator.html
+++ b/rdgenerator/templates/generator.html
@@ -120,7 +120,7 @@
                 </div>
                 <select name="platform" id="id_platform">
                     <option value="windows" selected>Windows</option>
-                    <option value="linux">Linux (testing, will likely have issues)</option>
+                    <option value="linux">Linux</option>
                     <option value="android">Android (testing, will likely have issues)</option>
                 </select>
                 <label for="{{ form.version.id_for_label }}">Rustdesk Version:</label>