X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=all_new_2018%2Fborg.sh;h=18321b15fa949256cc3cd13077e6002ef73cee52;hb=0504405d378ed9f92ab63e2d339b52273ec8530d;hp=8cf0c441d42f75b8ccab931716ffc651e0358fb9;hpb=635bf647cf1479353c9e1b8423055cdb324a9c27;p=config

diff --git a/all_new_2018/borg.sh b/all_new_2018/borg.sh
index 8cf0c44..18321b1 100755
--- a/all_new_2018/borg.sh
+++ b/all_new_2018/borg.sh
@@ -10,18 +10,27 @@ usage() {
     echo "store"
     echo "check"
     echo "export_keyfiles"
+    echo "orgpush"
+    echo "orgpull"
     false
 }
 
 read_pw() {
-    eval $(ssh-agent)
-    ssh-add
-    stty -echo
-    printf "Passphrase: "
-    read password
-    stty echo
-    printf "\n"
-    export BORG_PASSPHRASE="${password}"
+    if [ "${#SSH_AGENT_PID}" -eq 0 ]; then
+        eval $(ssh-agent)
+        echo "ssh-add"
+        stty -echo
+        ssh-add
+        stty echo
+    fi
+    if [ "${#BORG_PASSPHRASE}" -eq 0 ]; then
+        stty -echo
+        printf "Borg passphrase: "
+        read password
+        stty echo
+        printf "\n"
+        export BORG_PASSPHRASE="${password}"
+    fi
 }
 
 if [ ! -f "${config_file}" ]; then
@@ -102,6 +111,35 @@ elif [ "${first_arg}" = "export_keyfiles" ]; then
     mv "${tar_target}" "${cur_dir}"
     cd
     rm -rf "${tmp_dir}"
+elif [ "${first_arg}" = "orgpush" ]; then
+    archive_name="orgdir"
+    to_backup=~/org
+    read_pw
+    cat "${config_file}" | while read line; do
+        first_char=$(echo "${line}" | cut -c1)
+        if [ "${first_char}" = "#" ]; then
+            continue
+        fi
+        repo="${line}:${standard_repo}"
+        archive="${repo}::${archive_name}-{utcnow:%Y-%m-%dT%H:%M}"
+        echo "Creating archive: ${archive}"
+        borg create --verbose --list "${archive}" "${to_backup}" --exclude ~/org/.git
+    done
+elif [ "${first_arg}" = "orgpull" ]; then
+    archive_name="orgdir"
+    read_pw
+    cd /
+    cat "${config_file}" | while read line; do
+        first_char=$(echo "${line}" | cut -c1)
+        if [ "${first_char}" = "#" ]; then
+            continue
+        fi
+        repo="${line}:${standard_repo}"
+        archive=$(borg list "${repo}" | grep "${orgdir}" | tail -1 | cut -f1 -d' ')
+        echo "Pulling archive: ${archive}"
+        borg extract --verbose "${repo}::${archive}"
+        break
+    done
 else
     usage
 fi