Remove secrets script, enhance secrets setup scripting elsewhere.

[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 4e5dbcf701ead735c09a2eaa347ee4aa420af1fa..7dd2f8f690ee80019a65e7716d6b98458ca68349 100755 (executable)
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -4,14 +4,38 @@ set -e
 public_repos_dir="${HOME}/public_repos"
 config_tree_prefix="${public_repos_dir}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
+repos_list_file="${public_repos_dir}/repos"
+dir_secrets="${HOME}/tmp_secrets"
+borgkeys_dir=~/.config/borg/keys
+ssh_dir=~/.ssh
+
+ensure_repo() {
+    repo_name="${1}"
+    if [ ! -d "${public_repos_dir}/${repo_name}" ]; then
+        cd "${public_repos_dir}"
+        git clone https://plomlompom.com/repos/clone/${repo_name}
+    fi
+}
 
 cd
 mkdir -p "${public_repos_dir}"
-if [ ! -d "${HOME}/${public_repos_dir}/config" ]; then
-    cd "${public_repos_dir}"
-    git clone https://plomlompom.com/repos/clone/config
-fi
+ensure_repo config
 cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_prefix}/home_files" "${HOME}" minimal user_eeepc
 curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash
-echo "As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."
+cd "${dir_secrets}"
+mkdir -p "${ssh_dir}"
+echo "Setting up .ssh"
+cp id_rsa ~/.ssh
+stty -echo
+ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
+stty echo
+tar xf borg_keyfiles.tar
+mkdir -p "${borgkeys_dir}"
+mv borg_keyfiles/* "${borgkeys_dir}"
+cd
+rm -rf "${dir_secrets}"
+cat "${repos_list_file}" | while read line; do
+    ensure_repo "${line}"
+done
+echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."