X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_home.sh;h=24f4c672214f214293a85864bf3caefe19f47e0a;hb=b1a6a5963be58adbc79cf2b49986ca523068bfdf;hp=b02ef6d17631854814cfa7c6e09e525fb3737f4b;hpb=d781128ab64a3247b66313120d05ab4eef4a4059;p=config
diff --git a/buster/setup_scripts/setup_home.sh b/buster/setup_scripts/setup_home.sh
index b02ef6d..24f4c67 100755
--- a/buster/setup_scripts/setup_home.sh
+++ b/buster/setup_scripts/setup_home.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 1 ]; then
echo 'Need exactly one argument (system name).'
false
fi
-if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ]; then
+if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ]&& [ ! "$1" = "x220" ]; then
echo "Need legal system name."
false
fi
@@ -28,10 +28,22 @@ ensure_repo() {
repo_name="${1}"
if [ ! -d "${public_repos_dir}/${repo_name}" ]; then
cd "${public_repos_dir}"
- git clone plom@plomlompom.com:/var/public_repos/${repo_name}
+ git clone plom@plomlompom.com:/var/repos/${repo_name}
fi
}
+# Set up iniitial non-public parts of infrastructure: SSH authentication.
+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
+eval $(ssh-agent)
+ssh-add
+ssh-keyscan -H "plomlompom.com" >> ~/.ssh/known_hosts
+
# Clone config to copy dotfiles etc. from it.
cd
mkdir -p "${public_repos_dir}"
@@ -40,16 +52,11 @@ cd "${setup_scripts_dir}"
./copy_dirtree.sh "${config_tree_buster}/home_files" "${HOME}" minimal user "${system_name}"
# Set up native messenger for tridactyl.
-curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash
+version='ef9f02d0da258f68d7faf8898707f6d83d90d07a'
+curl -fsSl "https://raw.githubusercontent.com/tridactyl/tridactyl/${version}/native/install.sh" | bash
-# Set up non-public parts of infrastructure.
+# Set up further non-public parts of infrastructure.
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
script -c 'gpg --import secret_keys.asc' /dev/null
tar xf borg_keyfiles.tar
mkdir -p "${borgkeys_dir}"
@@ -92,4 +99,4 @@ if [ -f "${HOME}/${authinfo_file}" ]; then
fi
# 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."
+echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run, wait a little while (Tridactyl needs to walk through all commands in the .tridactylrc) and then re-start."