From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 6 May 2019 18:06:01 +0000 (+0200)
Subject: More scripts fixing.
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=c681b2838dd4d774e37801101c384312057af801;p=config

More scripts fixing.
---

diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index a32f835..fa3faec 100755
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -46,10 +46,9 @@ mv *.xpi "${extensions_dir}"
 cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_prefix}/home_files" "/root" minimal root
 HOME_DIR_EXISTS=$([ ! -d "/home/plom" ]; echo $?)
-if [ ! -d "/home/plom" ]; then
 adduser --disabled-password --gecos "" plom
 usermod -a -G sudo plom
-if [ ! "${HOME_DIR_EXISTS}" -eq 0 ]; then
+if [ "${HOME_DIR_EXISTS}" -eq 0 ]; then
     cp setup_home_eeepc.sh /home/plom
     chown plom:plom /home/plom/setup_home_eeepc.sh
     su -c "cd && ./setup_home_eeepc.sh" plom
diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index d4ac131..0ad9db5 100755
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
 set -e
 
-cd
+config_tree_prefix="${HOME}/config/buster"
+setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 public_repos_dir=~/public_repos
+
+cd
 mkdir -p "${public_repos_dir}"
-if [ ! -d "/home/plom/${public_repos_dir}/config" ]; then
+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" "/root" 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."