rustdesk лет назад: 3
Родитель
Сommit
6ec46cb95f
3 измененных файлов с 3 добавлено и 6 удалено
  1. 1 1
      libs/hbb_common/src/config.rs
  2. 1 4
      libs/hbb_common/src/lib.rs
  3. 1 1
      libs/hbb_common/src/platform/linux.rs

+ 1 - 1
libs/hbb_common/src/config.rs

@@ -288,7 +288,7 @@ fn patch(path: PathBuf) -> PathBuf {
288
                         .trim()
288
                         .trim()
289
                         .to_owned();
289
                         .to_owned();
290
                     if user != "root" {
290
                     if user != "root" {
291
-                        return format!("/home/{}", user).into();
291
+                        return format!("/home/{user}").into();
292
                     }
292
                     }
293
                 }
293
                 }
294
             }
294
             }

+ 1 - 4
libs/hbb_common/src/lib.rs

@@ -211,10 +211,7 @@ pub fn gen_version() {
211
     // generate build date
211
     // generate build date
212
     let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M"));
212
     let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M"));
213
     file.write_all(
213
     file.write_all(
214
-        format!(
215
-            "#[allow(dead_code)]\npub const BUILD_DATE: &str = \"{build_date}\"\n;"
216
-        )
217
-        .as_bytes(),
214
+        format!("#[allow(dead_code)]\npub const BUILD_DATE: &str = \"{build_date}\";\n").as_bytes(),
218
     )
215
     )
219
     .ok();
216
     .ok();
220
     file.sync_all().ok();
217
     file.sync_all().ok();

+ 1 - 1
libs/hbb_common/src/platform/linux.rs

@@ -60,7 +60,7 @@ fn get_display_server_of_session(session: &str) -> String {
60
                     .replace("TTY=", "")
60
                     .replace("TTY=", "")
61
                     .trim_end()
61
                     .trim_end()
62
                     .into();
62
                     .into();
63
-                if let Ok(xorg_results) = run_cmds(format!("ps -e | grep \"{}.\\\\+Xorg\"", tty))
63
+                if let Ok(xorg_results) = run_cmds(format!("ps -e | grep \"{tty}.\\\\+Xorg\""))
64
                 // And check if Xorg is running on that tty
64
                 // And check if Xorg is running on that tty
65
                 {
65
                 {
66
                     if xorg_results.trim_end() != "" {
66
                     if xorg_results.trim_end() != "" {