From 51c4eacbf35f24111be8f09c95a998667b12681f Mon Sep 17 00:00:00 2001
From: sevichecc <91365763+Sevichecc@users.noreply.github.com>
Date: Wed, 1 Feb 2023 01:48:18 +0800
Subject: [PATCH] Refactor expect script,close #1

---
 .env         |  6 ------
 backup.sh    | 18 +-----------------
 duplicacy.sh | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 duplicacy.sh

diff --git a/.env b/.env
index 778ff60..f902805 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,3 @@
-# duplicacy 
-#SNAPSHOT_ID=
-#ACCESS_KEY_ID=
-#SECRET_ACCESS_KEY=
-#PASSWORD=
-
 PLEROMA_DB=pleroma
 PLEROMA_PATH=/var/lib/pleroma
 PLEROMA_CONFIG_PATH=/etc/pleroma/config.exs
diff --git a/backup.sh b/backup.sh
index 951150c..50dc5b8 100644
--- a/backup.sh
+++ b/backup.sh
@@ -19,23 +19,7 @@ cp ${PLEROMA_CONFIG_PATH} ${BACKUP_PATH}
 
 echo "————————————upload to remote——————————"
 echo "4.backup to remote"
-/usr/bin/expect <<EOF
-    set time 30
-    spawn duplicacy backup -threads 4
-    expect {
-        "ID" { send "$ACCESS_KEY_ID\n"; exp_continue }
-        "Secret" { send "$SECRET_ACCESS_KEY\n"; exp_continue }
-        "password" { send "$PASSWORD\n" }
-    }
-# 5. (optional)Keep a revision every 7 days for revisions older than 30 days 
-#   spawn duplicacy prune -keep 7:30
-#   expect {
-#         "ID" { send "$ACCESS_KEY_ID\n"; exp_continue }
-#         "Secret" { send "$SECRET_ACCESS_KEY\n"; exp_continue }
-#         "password" { send "$PASSWORD\n" }
-#     }
-    expect eof
-EOF
+./duplicacy.sh
 
 echo "restart pleroma"
 sudo systemctl start pleroma 
diff --git a/duplicacy.sh b/duplicacy.sh
new file mode 100644
index 0000000..b978733
--- /dev/null
+++ b/duplicacy.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/expect 
+set ACCESS_KEY_ID "YOUR_ACCESS_KEY_ID"
+set SECRET_ACCESS_KEY "YOUR_SECRET_ACCESS_KEY"
+set PASSWORD "YOUR_PASSWORD"
+
+set timeout -1
+spawn duplicacy backup -threads 4
+
+expect "ID"
+send "$ACCESS_KEY_ID\r"
+
+expect "Secret"
+send "$SECRET_ACCESS_KEY\r"
+
+expect "password"
+send "$PASSWORD\r"
+
+##### (optional) Keep a revision every 7 days for revisions older than 30 days 
+# expect "completed"
+# spawn duplicacy prune -keep 7:30
+
+# expect "ID"
+# send "$ACCESS_KEY_ID\r"
+
+# expect "Secret"
+# send "$SECRET_ACCESS_KEY\r"
+
+# expect "password"
+# send "$PASSWORD\r"
+
+expect eof
+
+EOF
\ No newline at end of file