X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_eeepc.sh;h=a32f8358c61d506a14ee9fbf5aaae6ef49e8510c;hb=9dd90ef503372dad7d88ada5071270651fa74010;hp=47b05d0085e80bc025a1c22b00b6c09eed87cd62;hpb=408b30e6324ffc83196dc260cc7bb1b9bc49f74a;p=config
diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index 47b05d0..a32f835 100755
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -35,9 +35,9 @@ url_noscript="https://secure.informaction.com/download/releases/${noscript_xpi}"
wget "${url_noscript}"
name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
mv "${noscript_xpi}" "${name}.xpi"
-wget "${url_tridactyl}"
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}"
@@ -45,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