X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_eeepc.sh;h=a32f8358c61d506a14ee9fbf5aaae6ef49e8510c;hb=9dd90ef503372dad7d88ada5071270651fa74010;hp=4d1572cb53d26b962dd4a4d03e7c967cf81498b0;hpb=8368e48adc8c46e468e7d086a4024c527c8ed5e1;p=config

diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index 4d1572c..a32f835 100755
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -37,6 +37,7 @@ name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
 mv "${noscript_xpi}" "${name}.xpi"
 tridactyl_xpi="tridactyl-1.14.9pre2457-an+fx.xpi"
 url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
+wget "${url_tridactyl}"
 name=$(unzip -p "${tridactyl_xpi}" manifest.json | jq -r .applications.gecko.id)
 mv "${tridactyl_xpi}" "${name}.xpi"
 mv *.xpi "${extensions_dir}"
@@ -44,10 +45,13 @@ mv *.xpi "${extensions_dir}"
 # Set up user environments.
 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
-    su -c "cd && git clone https://plomlompom.com/repos/clone/config" plom
-    su -c "~/config/buster/setup_scripts/copy_dirtree.sh ~/config/buster/home_files ~ minimal user_eeepc" plom
-    passwd plom
+adduser --disabled-password --gecos "" plom
+usermod -a -G sudo plom
+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
 fi
+passwd plom