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 55f853f7c60eed279bbddbaf31c6f51bf46f4227..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() {
@@ -19,13 +20,17 @@ ensure_repo() {
     fi
 }
 
+# Clone config to copy dotfiles etc. from it.
 cd
 mkdir -p "${public_repos_dir}"
 ensure_repo config
 cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_buster}/home_files" "${HOME}" minimal user_eeepc
+
+# Set up native messenger for tridactyl.
 curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash
 
+# Set up non-public parts of infrastructure.
 cd "${dir_secrets}"
 mkdir -p "${ssh_dir}"
 echo "Setting up .ssh"
@@ -39,8 +44,26 @@ mv borg_keyfiles/* "${borgkeys_dir}"
 cd
 rm -rf "${dir_secrets}"
 
-"${path_borgscript}"
+# Sync org dir via borgbackup. For this we need the borgbackup servers
+# in our .ssh/known_hosts file.
+cat "${borgrepos_file}" | while read line; do
+    first_char=$(echo "${line}" | cut -c1)
+    if [ "${first_char}" = "#" ]; then
+        continue
+    fi
+    server=$(echo "${line}" | sed 's/.*@//')
+    ssh-keyscan "${server}" >> "${ssh_dir}"/known_hosts
+done
+BORG_PASSPHRASE="${SECRETS_PASS}" "${path_borgscript}" orgpull
+
+# Fill ~/public_repos.
 cat "${repos_list_file}" | while read line; do
+    first_char=$(echo "${line}" | cut -c1)
+    if [ "${first_char}" = "#" ]; then
+        continue
+    fi
     ensure_repo "${line}"
 done
+
+# Final note on how to integrate tridactyl.
 echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."