diff --git a/entry.sh b/entry.sh index 110681c..22bb959 100755 --- a/entry.sh +++ b/entry.sh @@ -1,30 +1,5 @@ #!/bin/bash -function user_install(){ - - dbus-launch dconf write /org/mate/desktop/interface/gtk-theme "'Materia-dark'" - dbus-launch dconf write /org/mate/marco/general/theme "'Materia-dark'" - dbus-launch dconf write /org/mate/desktop/interface/icon-theme "'Adwaita'" - dbus-launch dconf write /org/mate/desktop/peripherals/mouse/cursor-theme "'Adwaita'" - - rsync -a /root/unbox_data/secrets/SSH/ .ssh/ - - git clone ssh://git@git.neulandlabor.de:2222/j3d1/laptop_tools.git Tools - - #wget --show-progress -qO ./toolbox.tar.gz https://download.jetbrains.com/toolbox/jetbrains-toolbox-1.20.7940.tar.gz - - #TOOLBOX_TEMP_DIR=$(mktemp -d) - - #tar -C "$TOOLBOX_TEMP_DIR" -xf toolbox.tar.gz - #rm ./toolbox.tar.gz - - #"$TOOLBOX_TEMP_DIR"/*/jetbrains-toolbox - - #rm -r "$TOOLBOX_TEMP_DIR" - echo -} - - function first_stage(){ set -e echo foo first_stage @@ -32,7 +7,6 @@ function first_stage(){ echo -n "hostname: " read hostname_in export NEW_HOSTNAME=$hostname_in - echo echo -n "luks password: " read -s luks_password_in @@ -162,7 +136,7 @@ function second_stage(){ update-initramfs -k all -u mkdir /snap btrfs subvolume snapshot / /snap/$(date +%Y-%m-%d_basesystem) - apt install -y mate-desktop-environment #task-mate-desktop mate-desktop-environment-extra + apt install -y task-mate-desktop mate-desktop-environment-extra ( echo $USER_PASSWORD echo $USER_PASSWORD @@ -189,6 +163,30 @@ function second_stage(){ echo second_stage done } +function user_install(){ + + dbus-launch dconf write /org/mate/desktop/interface/gtk-theme "'Materia-dark'" + dbus-launch dconf write /org/mate/marco/general/theme "'Materia-dark'" + dbus-launch dconf write /org/mate/desktop/interface/icon-theme "'Adwaita'" + dbus-launch dconf write /org/mate/desktop/peripherals/mouse/cursor-theme "'Adwaita'" + + rsync -a /root/unbox_data/secrets/SSH/ .ssh/ + + git clone ssh://git@git.neulandlabor.de:2222/j3d1/laptop_tools.git Tools + + #wget --show-progress -qO ./toolbox.tar.gz https://download.jetbrains.com/toolbox/jetbrains-toolbox-1.20.7940.tar.gz + + #TOOLBOX_TEMP_DIR=$(mktemp -d) + + #tar -C "$TOOLBOX_TEMP_DIR" -xf toolbox.tar.gz + #rm ./toolbox.tar.gz + + #"$TOOLBOX_TEMP_DIR"/*/jetbrains-toolbox + + #rm -r "$TOOLBOX_TEMP_DIR" + echo +} + function post_install_stage(){ sleep 0.5