修复Linux下的编译错误

opensound-org · Sep 11, 2024 · 50a0917 · 50a0917
1 parent e355daa
commit 50a0917
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/ops/caddy.rs b/src/ops/caddy.rs
@@ -238,10 +238,7 @@ pub async fn upgrade(config: &Config) -> Result<(), anyhow::Error> {
             fs::write(&path, contents).await?;
 
             #[cfg(not(windows))]
-            chmod_exec(path).await?;
-
-            #[cfg(not(windows))]
-            use super::super::spawn_command;
+            crate::utils::chmod_exec(path).await?;
 
             #[cfg(not(windows))]
             {

diff --git a/src/ops/hugo.rs b/src/ops/hugo.rs
@@ -133,7 +133,7 @@ impl Hugo {
                 fs::write(&path, contents).await?;
 
                 #[cfg(not(windows))]
-                chmod_exec(path).await?;
+                crate::utils::chmod_exec(path).await?;
             }
         }
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -74,7 +74,7 @@ pub fn unzip(z: &[u8], e_name: &str) -> Result<(OsString, Vec<u8>), anyhow::Erro
 pub async fn chmod_exec(path: impl AsRef<std::path::Path>) -> Result<(), anyhow::Error> {
     tracing::info!("正在设置执行权限……");
     use std::{fs::Permissions, os::unix::prelude::PermissionsExt};
-    Ok(fs::set_permissions(path, Permissions::from_mode(0o755)).await?)
+    Ok(tokio::fs::set_permissions(path, Permissions::from_mode(0o755)).await?)
 }
 
 pub async fn spawn_command(cmd: &mut Command, hint: &str) -> Result<(), anyhow::Error> {