From ceaf44f71d5d96073281fdb28702c05f8927a6a4 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Wed, 10 Dec 2025 16:35:30 -0600 Subject: [PATCH] testing print driver with custom_.txt --- .github/patches/allowCustom.py | 5 ++- .github/workflows/generator-android.yml | 16 ++++---- .github/workflows/generator-linux.yml | 4 +- .github/workflows/generator-windows.yml | 50 ++++++++++++------------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/.github/patches/allowCustom.py b/.github/patches/allowCustom.py index addfa86..83a8f90 100644 --- a/.github/patches/allowCustom.py +++ b/.github/patches/allowCustom.py @@ -35,14 +35,15 @@ def remove_line_block(filepath, start_phrase, lines_to_remove_after_start): # Note: We subtract 1 because the 'continue' will handle the first line removal immediately continue - # If we are not skipping, keep the line + # If we are not skipping, keep the line, but change custom.txt to custom_.txt + line = line.replace("custom.txt", "custom_.txt") lines_to_keep.append(line) except FileNotFoundError: print(f"Error: File not found at {filepath}") return - # 3. Write the remaining lines back to the file (with backup) + # 3. Write the remaining lines back to the file try: with open(filepath, 'w') as file: file.writelines(lines_to_keep) diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index 1fc856a..93862ab 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -503,8 +503,8 @@ jobs: mkdir -p ./flutter/android/app/src/main/jniLibs/arm64-v8a 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 "${{ inputs.custom }}" | cat > ./flutter/assets/custom.txt - #sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml + echo -n "${{ inputs.custom }}" | cat > ./flutter/assets/custom_.txt + #sed -i '/^ - assets\//a\ - assets/custom_.txt' ./flutter/pubspec.yaml # build flutter pushd flutter flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-arm64 --split-per-abi @@ -514,8 +514,8 @@ jobs: mkdir -p ./flutter/android/app/src/main/jniLibs/armeabi-v7a cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so ./flutter/android/app/src/main/jniLibs/armeabi-v7a/ cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/armeabi-v7a/librustdesk.so - echo -n "${{ inputs.custom }}" | cat > ./flutter/assets/custom.txt - #sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml + echo -n "${{ inputs.custom }}" | cat > ./flutter/assets/custom_.txt + #sed -i '/^ - assets\//a\ - assets/custom_.txt' ./flutter/pubspec.yaml # build flutter pushd flutter flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-arm --split-per-abi @@ -525,8 +525,8 @@ jobs: mkdir -p ./flutter/android/app/src/main/jniLibs/x86_64 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 "${{ inputs.custom }}" | cat > ./flutter/assets/custom.txt - #sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml + echo -n "${{ inputs.custom }}" | cat > ./flutter/assets/custom_.txt + #sed -i '/^ - assets\//a\ - assets/custom_.txt' ./flutter/pubspec.yaml # build flutter pushd flutter flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-x64 --split-per-abi @@ -536,8 +536,8 @@ jobs: mkdir -p ./flutter/android/app/src/main/jniLibs/x86 cp ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so ./flutter/android/app/src/main/jniLibs/x86/ cp ./target/${{ matrix.job.target }}/release/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/x86/librustdesk.so - echo -n "${{ inputs.custom }}" | cat > ./flutter/assets/custom.txt - #sed -i '/^ - assets\//a\ - assets/custom.txt' ./flutter/pubspec.yaml + echo -n "${{ inputs.custom }}" | cat > ./flutter/assets/custom_.txt + #sed -i '/^ - assets\//a\ - assets/custom_.txt' ./flutter/pubspec.yaml # build flutter pushd flutter flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-x86 --split-per-abi diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index fe35b57..7422be0 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -302,7 +302,7 @@ jobs: git apply allowCustom.diff wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeSetupServerTip.diff git apply removeSetupServerTip.diff - echo -n "${{ inputs.custom }}" | cat > ./custom.txt + echo -n "${{ inputs.custom }}" | cat > ./custom_.txt # sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml sed -i -e 's|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs @@ -522,7 +522,7 @@ jobs: export CARGO_INCREMENTAL=0 export DEB_ARCH=${{ matrix.job.deb_arch }} mkdir -p flutter/tmpdeb/usr/share/rustdesk - cp ./custom.txt ./flutter/tmpdeb/usr/share/rustdesk/custom.txt + cp ./custom_.txt ./flutter/tmpdeb/usr/share/rustdesk/custom_.txt if [[ "${{ inputs.logolink }}" != "false" ]]; then wget -O ./flutter/assets/logo.png ${{ fromJson(inputs.logolink).url }}/get_png?filename=${{ fromJson(inputs.logolink).file }}"&"uuid=${{ fromJson(inputs.logolink).uuid }} fi diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 1d45e81..b8c704f 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -480,31 +480,31 @@ jobs: mv -Force .\usbmmidd_v2 ./rustdesk # Download printer driver files and extract them to ./rustdesk - # try { - # Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/rustdesk_printer_driver_v4-1.4.zip -OutFile rustdesk_printer_driver_v4-1.4.zip - # Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/printer_driver_adapter.zip -OutFile printer_driver_adapter.zip - # Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/sha256sums -OutFile sha256sums + try { + Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/rustdesk_printer_driver_v4-1.4.zip -OutFile rustdesk_printer_driver_v4-1.4.zip + Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/printer_driver_adapter.zip -OutFile printer_driver_adapter.zip + Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/sha256sums -OutFile sha256sums - # # Check and move the files - # $checksum_driver = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*rustdesk_printer_driver_v4-1.4\.zip$').Matches.Groups[1].Value - # $downloadsum_driver = Get-FileHash -Path rustdesk_printer_driver_v4-1.4.zip -Algorithm SHA256 - # $checksum_adapter = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*printer_driver_adapter\.zip$').Matches.Groups[1].Value - # $downloadsum_adapter = Get-FileHash -Path printer_driver_adapter.zip -Algorithm SHA256 - # if ($checksum_driver -eq $downloadsum_driver.Hash -and $checksum_adapter -eq $downloadsum_adapter.Hash) { - # Write-Output "rustdesk_printer_driver_v4-1.4, checksums match, extract the file." - # Expand-Archive rustdesk_printer_driver_v4-1.4.zip -DestinationPath . - # mkdir ./rustdesk/drivers - # mv -Force .\rustdesk_printer_driver_v4-1.4 ./rustdesk/drivers/RustDeskPrinterDriver - # Expand-Archive printer_driver_adapter.zip -DestinationPath . - # mv -Force .\printer_driver_adapter.dll ./rustdesk - # } elseif ($checksum_driver -ne $downloadsum_driver.Hash) { - # Write-Output "rustdesk_printer_driver_v4-1.4, checksums do not match, ignore the file." - # } else { - # Write-Output "printer_driver_adapter.dll, checksums do not match, ignore the file." - # } - # } catch { - # Write-Host "Ingore the printer driver error." - # } + # Check and move the files + $checksum_driver = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*rustdesk_printer_driver_v4-1.4\.zip$').Matches.Groups[1].Value + $downloadsum_driver = Get-FileHash -Path rustdesk_printer_driver_v4-1.4.zip -Algorithm SHA256 + $checksum_adapter = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*printer_driver_adapter\.zip$').Matches.Groups[1].Value + $downloadsum_adapter = Get-FileHash -Path printer_driver_adapter.zip -Algorithm SHA256 + if ($checksum_driver -eq $downloadsum_driver.Hash -and $checksum_adapter -eq $downloadsum_adapter.Hash) { + Write-Output "rustdesk_printer_driver_v4-1.4, checksums match, extract the file." + Expand-Archive rustdesk_printer_driver_v4-1.4.zip -DestinationPath . + mkdir ./rustdesk/drivers + mv -Force .\rustdesk_printer_driver_v4-1.4 ./rustdesk/drivers/RustDeskPrinterDriver + Expand-Archive printer_driver_adapter.zip -DestinationPath . + mv -Force .\printer_driver_adapter.dll ./rustdesk + } elseif ($checksum_driver -ne $downloadsum_driver.Hash) { + Write-Output "rustdesk_printer_driver_v4-1.4, checksums do not match, ignore the file." + } else { + Write-Output "printer_driver_adapter.dll, checksums do not match, ignore the file." + } + } catch { + Write-Host "Ingore the printer driver error." + } - name: icon stuff if: ${{ inputs.iconlink != 'false' }} @@ -582,7 +582,7 @@ jobs: - name: Create custom.txt file shell: bash run: | - echo -n "${{ inputs.custom }}" | cat > ./rustdesk/custom.txt + echo -n "${{ inputs.custom }}" | cat > ./rustdesk/custom_.txt - name: Build self-extracted executable shell: bash