hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.2.0 -> 1.1.10

Browse Source
This commit is contained in:
rustdesk 2022-06-09 19:45:53 +08:00
parent 00afa50497
commit b88b4151bc
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -4043,7 +4043,7 @@ dependencies = [
[[package]] [[package]]
name = "rustdesk" name = "rustdesk"
version = "1.2.0" version = "1.1.10"
dependencies = [ dependencies = [
"android_logger 0.11.0", "android_logger 0.11.0",
"arboard", "arboard",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "rustdesk" name = "rustdesk"
version = "1.2.0" version = "1.1.10"
authors = ["rustdesk <info@rustdesk.com>"] authors = ["rustdesk <info@rustdesk.com>"]
edition = "2021" edition = "2021"
build= "build.rs" build= "build.rs"

2
appimage/AppImageBuilder.yml
View File

@ -26,7 +26,7 @@ AppDir:
id: rustdesk id: rustdesk
name: RustDesk name: RustDesk
icon: rustdesk icon: rustdesk
version: 1.2.0 version: 1.1.10
exec: usr/bin/rustdesk exec: usr/bin/rustdesk
exec_args: $@ exec_args: $@
apt: apt:

2
appimage/rustdesk.desktop
View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Version=1.2.0 Version=1.1.10
Name=RustDesk Name=RustDesk
GenericName=Remote Desktop GenericName=Remote Desktop
Comment=Remote Desktop Comment=Remote Desktop

1
build_appimage.py
View File

@ -13,6 +13,7 @@ if __name__ == '__main__':
version = get_version() version = get_version()
os.chdir("appimage") os.chdir("appimage")
os.system("sed -i 's/^Version=.*/Version=%s/g' rustdesk.desktop" % version) os.system("sed -i 's/^Version=.*/Version=%s/g' rustdesk.desktop" % version)
os.system("sed -i 's/^ version: .*/ version: %s/g' AppImageBuilder.yml" % version)
# build appimage # build appimage
ret = os.system("appimage-builder --recipe AppImageBuilder.yml --skip-test") ret = os.system("appimage-builder --recipe AppImageBuilder.yml --skip-test")
if ret == 0: if ret == 0:

2
libs/hbb_common/src/fs.rs
View File

@ -195,7 +195,7 @@ pub fn is_file_exists(file_path: &str) -> bool {
#[inline] #[inline]
pub fn can_enable_overwrite_detection(version: i64) -> bool { pub fn can_enable_overwrite_detection(version: i64) -> bool {
version >= get_version_number("1.2.0") version >= get_version_number("1.1.10")
} }
#[derive(Default)] #[derive(Default)]

4
src/common.rs
View File

@ -14,7 +14,7 @@ use hbb_common::{
}; };
#[cfg(any(target_os = "android", target_os = "ios", feature = "cli"))] #[cfg(any(target_os = "android", target_os = "ios", feature = "cli"))]
use hbb_common::{config::RENDEZVOUS_PORT, futures::future::join_all}; use hbb_common::{config::RENDEZVOUS_PORT, futures::future::join_all};
use std::{sync::{Arc, Mutex}, path::Path}; use std::sync::{Arc, Mutex};
pub const CLIPBOARD_NAME: &'static str = "clipboard"; pub const CLIPBOARD_NAME: &'static str = "clipboard";
pub const CLIPBOARD_INTERVAL: u64 = 333; pub const CLIPBOARD_INTERVAL: u64 = 333;
@ -385,7 +385,7 @@ pub fn run_me<T: AsRef<std::ffi::OsStr>>(args: Vec<T>) -> std::io::Result<std::p
#[cfg(feature = "appimage")] #[cfg(feature = "appimage")]
{ {
let appdir = std::env::var("APPDIR").unwrap(); let appdir = std::env::var("APPDIR").unwrap();
let appimage_cmd = Path::new(&appdir).join("AppRun"); let appimage_cmd = std::path::Path::new(&appdir).join("AppRun");
log::info!("path: {:?}", appimage_cmd); log::info!("path: {:?}", appimage_cmd);
return std::process::Command::new(appimage_cmd).args(&args).spawn(); return std::process::Command::new(appimage_cmd).args(&args).spawn();
} }