X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=buster%2Fsetup_scripts%2Fsetup_home_eeepc.sh;h=c9703ec638d9e7f7d3833303268cb917e7806503;hb=f81a0eeab6709cff10599e0dfa8f7e5493847076;hp=be52afbc2656d4a268d5cb77182941acbb2e0f5e;hpb=d94a220e6a0a0a5ec0c0647a7359fde07f4f1fc4;p=config

diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index be52afb..c9703ec 100755
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -2,12 +2,12 @@
 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"
-secrets_dev="sdb"
-source_dir="/media/${secrets_dev}/to_usb"
-target_dir="${HOME}/tmp_to_usb"
+dir_secrets="${HOME}/tmp_secrets"
 borgkeys_dir=~/.config/borg/keys
 ssh_dir=~/.ssh
 
@@ -23,27 +23,24 @@ cd
 mkdir -p "${public_repos_dir}"
 ensure_repo config
 cd "${setup_scripts_dir}"
-./copy_dirtree.sh "${config_tree_prefix}/home_files" "${HOME}" minimal user_eeepc
-cat "${repos_list_file}" | while read line; do
-    ensure_repo "${line}"
-done
+./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
-while [ ! -e /dev/"${secrets_dev}" ]; do
-    echo "Put secrets drive into slot for /dev/${secrets_dev}, then hit Return."
-    read ignore
-done
-sudo pmount /dev/"${secrets_dev}"
-cp -a "${source_dir}" "${target_dir}"
-sudo pumount "${secrets_dev}"
-echo "You can remove /dev/${secrets_dev} now."
-cd "${target_dir}"
+
+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 "${target_dir}"
+rm -rf "${dir_secrets}"
+
+"${path_borgscript}" orgpull
+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."