X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_home_eeepc.sh;h=55f853f7c60eed279bbddbaf31c6f51bf46f4227;hb=9981fbe8b1a46056d57b8793af305b0e78c30941;hp=9e902f890942189b33d117d75b3fb74210dd114c;hpb=203ed9892e81e1df5137930a4b367dd7bf22a64c;p=config

diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index 9e902f8..55f853f 100755
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -2,13 +2,18 @@
 set -e
 
 public_repos_dir="${HOME}/public_repos"
-config_tree_prefix="${public_repos_dir}/config/buster"
-setup_scripts_dir="${config_tree_prefix}/setup_scripts"
+config_tree_prefix="${public_repos_dir}/config"
+path_borgscript="${config_tree_prefix}/all_new_2018/borg.sh"
+config_tree_buster="${config_tree_prefix}/buster"
+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
+ssh_dir=~/.ssh
 
 ensure_repo() {
     repo_name="${1}"
-    if [ ! -d "${HOME}/${public_repos_dir}/${repo_name}" ]; then
+    if [ ! -d "${public_repos_dir}/${repo_name}" ]; then
         cd "${public_repos_dir}"
         git clone https://plomlompom.com/repos/clone/${repo_name}
     fi
@@ -17,14 +22,25 @@ ensure_repo() {
 cd
 mkdir -p "${public_repos_dir}"
 ensure_repo config
-#if [ ! -d "${HOME}/${public_repos_dir}/config" ]; then
-#    cd "${public_repos_dir}"
-#    git clone https://plomlompom.com/repos/clone/config
-#fi
 cd "${setup_scripts_dir}"
-./copy_dirtree.sh "${config_tree_prefix}/home_files" "${HOME}" minimal user_eeepc
+./copy_dirtree.sh "${config_tree_buster}/home_files" "${HOME}" minimal user_eeepc
+curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash
+
+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}"
+
+"${path_borgscript}"
 cat "${repos_list_file}" | while read line; do
     ensure_repo "${line}"
 done
-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."
+echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."