Skip to content

Commit

Permalink
Fix. Remove idd
Browse files Browse the repository at this point in the history
Signed-off-by: fufesou <[email protected]>
  • Loading branch information
fufesou committed Feb 19, 2024
1 parent cf0e3ec commit febe83c
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/flutter-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
# vcpkg version: 2023.04.15
# for multiarch gcc compatibility
VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1"
VERSION: "1.2.3"
VERSION: "1.2.3-1"
NDK_VERSION: "r25c"
#signing keys env variable checks
ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flutter-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
secrets: inherit
with:
upload-artifact: true
upload-tag: "1.2.3"
upload-tag: "1.2.3-1"
2 changes: 1 addition & 1 deletion .github/workflows/history.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# vcpkg version: 2022.05.10
# for multiarch gcc compatibility
VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1"
VERSION: "1.2.3"
VERSION: "1.2.3-1"

jobs:
build-for-history-windows:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustdesk"
version = "1.2.3"
version = "1.2.3-1"
authors = ["rustdesk <[email protected]>"]
edition = "2021"
build= "build.rs"
Expand Down
4 changes: 2 additions & 2 deletions appimage/AppImageBuilder-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
script:
- rm -rf ./AppDir || true
- bsdtar -zxvf ../rustdesk-1.2.3.deb
- bsdtar -zxvf ../rustdesk-1.2.3-1.deb
- tar -xvf ./data.tar.xz
- mkdir ./AppDir
- mv ./usr ./AppDir/usr
Expand All @@ -18,7 +18,7 @@ AppDir:
id: rustdesk
name: rustdesk
icon: rustdesk
version: 1.2.3
version: 1.2.3-1
exec: usr/lib/rustdesk/rustdesk
exec_args: $@
apt:
Expand Down
4 changes: 2 additions & 2 deletions appimage/AppImageBuilder-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 1
script:
- rm -rf ./AppDir || true
- bsdtar -zxvf ../rustdesk-1.2.3.deb
- bsdtar -zxvf ../rustdesk-1.2.3-1.deb
- tar -xvf ./data.tar.xz
- mkdir ./AppDir
- mv ./usr ./AppDir/usr
Expand All @@ -18,7 +18,7 @@ AppDir:
id: rustdesk
name: rustdesk
icon: rustdesk
version: 1.2.3
version: 1.2.3-1
exec: usr/lib/rustdesk/rustdesk
exec_args: $@
apt:
Expand Down
10 changes: 1 addition & 9 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ def get_version():

def parse_rc_features(feature):
available_features = {
'IddDriver': {
'platform': ['windows'],
'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/RustDeskIddDriver_x64.zip',
'checksum_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.3/checksum_md5',
'exclude': ['README.md', 'certmgr.exe', 'install_cert_runas_admin.bat', 'RustDeskIddApp.exe'],
},
'PrivacyMode': {
'platform': ['windows'],
'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1'
Expand Down Expand Up @@ -109,7 +103,7 @@ def make_parser():
nargs='+',
default='',
help='Integrate features, windows only.'
'Available: IddDriver, PrivacyMode. Special value is "ALL" and empty "". Default is empty.')
'Available: PrivacyMode. Special value is "ALL" and empty "". Default is empty.')
parser.add_argument('--flutter', action='store_true',
help='Build flutter package', default=False)
parser.add_argument(
Expand Down Expand Up @@ -261,8 +255,6 @@ def external_resources(flutter, args, res_dir):

def get_features(args):
features = ['inline'] if not args.flutter else []
if windows:
features.append('virtual_display_driver')
if args.hwcodec:
features.append('hwcodec')
if args.flutter:
Expand Down
4 changes: 2 additions & 2 deletions flatpak/rustdesk.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "rustdesk",
"buildsystem": "simple",
"build-commands": [
"bsdtar -zxvf rustdesk-1.2.3.deb",
"bsdtar -zxvf rustdesk-1.2.3-1.deb",
"tar -xvf ./data.tar.xz",
"cp -r ./usr/* /app/",
"mkdir -p /app/bin && ln -s /app/lib/rustdesk/rustdesk /app/bin/rustdesk",
Expand All @@ -26,7 +26,7 @@
"sources": [
{
"type": "file",
"path": "../rustdesk-1.2.3.deb"
"path": "../rustdesk-1.2.3-1.deb"
},
{
"type": "file",
Expand Down
40 changes: 1 addition & 39 deletions flutter/lib/desktop/pages/install_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class _InstallPageBodyState extends State<_InstallPageBody>
late final TextEditingController controller;
final RxBool startmenu = true.obs;
final RxBool desktopicon = true.obs;
final RxBool driverCert = true.obs;
final RxBool showProgress = false.obs;
final RxBool btnEnabled = true.obs;

Expand Down Expand Up @@ -158,10 +157,6 @@ class _InstallPageBodyState extends State<_InstallPageBody>
Option(startmenu, label: 'Create start menu shortcuts')
.marginOnly(bottom: 7),
Option(desktopicon, label: 'Create desktop icon'),
Offstage(
offstage: !Platform.isWindows,
child: Option(driverCert, label: 'install_cert_tip'),
).marginOnly(top: 7),
Container(
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
Expand Down Expand Up @@ -253,43 +248,10 @@ class _InstallPageBodyState extends State<_InstallPageBody>
String args = '';
if (startmenu.value) args += ' startmenu';
if (desktopicon.value) args += ' desktopicon';
if (driverCert.value) args += ' driverCert';
bind.installInstallMe(options: args, path: controller.text);
}

if (driverCert.isTrue) {
final tag = 'install-info-install-cert-confirm';
final btns = [
OutlinedButton.icon(
icon: Icon(Icons.close_rounded, size: 16),
label: Text(translate('Cancel')),
onPressed: () => gFFI.dialogManager.dismissByTag(tag),
style: buttonStyle,
),
ElevatedButton.icon(
icon: Icon(Icons.done_rounded, size: 16),
label: Text(translate('OK')),
onPressed: () {
gFFI.dialogManager.dismissByTag(tag);
do_install();
},
style: buttonStyle,
)
];
gFFI.dialogManager.show(
(setState, close, context) => CustomAlertDialog(
title: null,
content: SelectionArea(
child:
msgboxContent('info', 'Warning', 'confirm_install_cert_tip')),
actions: btns,
onCancel: close,
),
tag: tag,
);
} else {
do_install();
}
do_install();
}

void selectInstallPath() async {
Expand Down
2 changes: 1 addition & 1 deletion res/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pkgname=rustdesk
pkgver=1.2.3
pkgver=1.2.3-1
pkgrel=0
epoch=
pkgdesc=""
Expand Down
2 changes: 1 addition & 1 deletion res/rpm-flutter-suse.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: rustdesk
Version: 1.2.3
Version: 1.2.3-1
Release: 0
Summary: RPM package
License: GPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion res/rpm-flutter.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: rustdesk
Version: 1.2.3
Version: 1.2.3-1
Release: 0
Summary: RPM package
License: GPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion res/rpm.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: rustdesk
Version: 1.2.3
Version: 1.2.3-1
Release: 0
Summary: RPM package
License: GPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion src/core_main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ pub fn core_main() -> Option<Vec<String>> {
return None;
} else if args[0] == "--silent-install" {
let res = platform::install_me(
"desktopicon startmenu driverCert",
"desktopicon startmenu",
"".to_owned(),
true,
args.len() > 1,
Expand Down
2 changes: 0 additions & 2 deletions src/lang/en.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Default Codec", "Default codec"),
("Other Default Options", "Other default options"),
("relay_hint_tip", "It may not be possible to connect directly; you can try connecting via relay. Additionally, if you want to use a relay on your first attempt, you can add the \"/r\" suffix to the ID or select the option \"Always connect via relay\" in the card of recent sessions if it exists."),
("install_cert_tip", "Install RustDesk certificate"),
("confirm_install_cert_tip", "This is a RustDesk testing certificate, which can be trusted. The certificate will be used to trust and install RustDesk drivers when required."),
("RDP Settings", "RDP settings"),
("New Connection", "New connection"),
("Your Device", "Your device"),
Expand Down
2 changes: 0 additions & 2 deletions src/lang/template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Resolution", ""),
("No transfers in progress", ""),
("Set one-time password length", ""),
("install_cert_tip", ""),
("confirm_install_cert_tip", ""),
("RDP Settings", ""),
("Sort by", ""),
("New Connection", ""),
Expand Down

0 comments on commit febe83c

Please sign in to comment.