From afb553896bd8f24d248d04dbebf3b9d25f8a1e57 Mon Sep 17 00:00:00 2001
From: Listum <listum@orudo.ru>
Date: Tue, 7 Nov 2023 04:27:52 +0300
Subject: [PATCH] Signing fixed + manual

---
 README.md       | 14 +++++---------
 src/build.rs    | 11 ++++++-----
 src/telegram.rs |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 2893d14..5d366e9 100644
--- a/README.md
+++ b/README.md
@@ -13,16 +13,12 @@
 
 1. Укажите токен бота телеграм
 ```bash
-# Unix-like
-$ export TELOXIDE_TOKEN=<Your token here>
-
-# Windows command line
-$ set TELOXIDE_TOKEN=<Your token here>
-
-# Windows PowerShell
-$ $env:TELOXIDE_TOKEN=<Your token here>
+$ export TELOXIDE_TOKEN=<Ваш токен>
 ```
-
+2. Добаьте GPG ключ для подписи (опционально)
+  - ```$ gpg --list-keys --keyid-format=long```
+  - rsa4096/*D8DDA4AE70FAD33E* копируем ID ключа после rsa4096,3072..итд
+  - ```$ export GPGKEY=<ID ключа>```
 3. Запустите бота
 ```bash
 ./aur_builder_bot
diff --git a/src/build.rs b/src/build.rs
index c60a351..fe92439 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -30,26 +30,27 @@ pub fn copy(dir: String, local_repo: String) -> Result<(), Box<dyn std::error::E
     Ok(())
 }
 
-pub fn build(default_dir: PathBuf) -> Result<(), Box<dyn std::error::Error>> {
+pub fn build() -> Result<(), Box<dyn std::error::Error>> {
     match std::env::var("GPGKEY") {
         Ok(value) => {
             Command::new("makepkg")
                 .arg("-s")
                 .arg("--sign")
-                .arg(format!("--key {}/{}",default_dir.as_os_str().to_str().unwrap() , value))
+                .arg(format!("--key={}", value))
                 .arg("--noconfirm")
                 .output()?;
-        }
+        },
         Err(_) => {
             Command::new("makepkg")
                 .arg("-s")
                 .arg("--noconfirm")
                 .output()?;
+
+        },
         }
+    Ok(())
     }
 
-    Ok(())
-}
 
 pub fn delete(dir: String) -> std::io::Result<()> {
     fs::remove_dir_all(dir)
diff --git a/src/telegram.rs b/src/telegram.rs
index 85f3123..a89e598 100644
--- a/src/telegram.rs
+++ b/src/telegram.rs
@@ -29,7 +29,7 @@ async fn answer(bot: Bot, msg: Message, cmd: Commands) -> ResponseResult<()> {
             bot.send_message(msg.chat.id, clone).await?;
 
             env::set_current_dir(pkg_dir.clone())?;
-            let build = match build(default_dir.clone()) {
+            let build = match build() {
                 Ok(..) => { format!("Builded") },
                 Err(e) => { format!("Build error: {}", e) }
             };