Some more fixes.

[config] / buster / setup_scripts / setup_home_eeepc.sh

diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index 74049de970f9c5332422753c1f28e19d3c785591..4422211572d05d6cb1e0bae4ef1c30090c618a8e 100755 (executable)
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -9,6 +9,7 @@ setup_scripts_dir="${config_tree_buster}/setup_scripts"
 repos_list_file="${public_repos_dir}/repos"
 dir_secrets="${HOME}/tmp_secrets"
 borgkeys_dir=~/.config/borg/keys
+borgrepos_file=~/.borgrepos
 ssh_dir=~/.ssh
 
 ensure_repo() {
@@ -45,14 +46,15 @@ rm -rf "${dir_secrets}"
 
 # Sync org dir via borgbackup. For this we need the borgbackup servers
 # in our .ssh/known_hosts file.
-cat "${borgconfig_file}" | while read line; do
+cat "${borgrepos_file}" | while read line; do
     first_char=$(echo "${line}" | cut -c1)
     if [ "${first_char}" = "#" ]; then
         continue
     fi
-    ssh-keyscan "${line}" >> "${ssh_dir}"/known_hosts
+    server=$(echo "${line}" | sed 's/.*@//')
+    ssh-keyscan "${server}" >> "${ssh_dir}"/known_hosts
 done
-"${path_borgscript}" orgpull
+BORG_PASSPHRASE="${SECRETS_PASS}" "${path_borgscript}" orgpull
 
 # Fill ~/public_repos.
 cat "${repos_list_file}" | while read line; do