diff --git a/elf_os.sh b/elf_os.sh index 1eedc6f..b72685c 100755 --- a/elf_os.sh +++ b/elf_os.sh @@ -168,7 +168,7 @@ run "create fist boot config" "cat >/mnt/first-boot.env <>"$LOG_FILE" echo "$1> $3" >>"$LOG_FILE" - bash -c "$box $3" &>>"$LOG_FILE" \ - && echo -e "\e[1A\e[K[ \e[32mOK\e[0m ] $1: $2" \ + bash -c "$prefix $3" &>>"$LOG_FILE" \ + && echo -e "[ \e[32mOK\e[0m ] $1: $2" \ || { - echo -e "\e[1A\e[K[\e[31mFAIL\e[0m] $1: $2" + echo -e "[\e[31mFAIL\e[0m] $1: $2" bash -c "$4" exit } echo >>"$LOG_FILE" } -run root "disable first boot service" "systemctl disable first_boot.service" +run root "disable first boot service" "systemctl disable first_boot.service" echo echo === install tools echo -run root "enable NetworkMaanger" "systemctl enable NetworkManager.service" -run root "start NetworkMaanger" "systemctl start NetworkManager.service" -run root "wait for network" "while [[ 1 ]] ; do ping -c1 1.1.1.1 && break ; done" -run root "install base tools" "pacman -Sy --noconfirm \ - usbutils dosfstools exfat-utils net-tools bind nmap libfido2 \ - base-devel vim curl ncdu neofetch btop git flatpak" -run root "install dev tools" "pacman -S --noconfirm ansible python3 gcc make cmake" # clangd -run root "install gnome" "pacman -S --noconfirm gnome" -run root "enable gnome" "systemctl enable gdm.service" -run root "install distrobox" "pacman -S --noconfirm docker distrobox" -run root "add $USERNAME to docker group" "usermod -aG docker $USERNAME" +run root "enable NetworkMaanger" "systemctl enable NetworkManager.service" +run root "start NetworkMaanger" "systemctl start NetworkManager.service" +run root "wait for network" "while [[ 1 ]] ; do ping -c1 1.1.1.1 && break ; done" +run root "install base tools" "pacman -Sy --noconfirm \ + usbutils dosfstools exfat-utils net-tools bind nmap libfido2 \ + base-devel vim curl ncdu neofetch btop git flatpak" +run root "install dev tools" "pacman -S --noconfirm ansible python3 gcc make cmake" # clangd +run root "install gnome" "pacman -S --noconfirm gnome" +run root "enable gnome" "systemctl enable gdm.service" +run root "install distrobox" "pacman -S --noconfirm docker distrobox" +run root "add $USERNAME to docker group" "usermod -aG docker $USERNAME" HOME_IP="$(dig +short home.freenen.nl)" -run root "update hosts file" "cat >>/etc/hosts <>/etc/hosts <>/home/$USERNAME/.bashrc <>/home/$USERNAME/.bashrc </dev/null || ssh-agent >\"$HOME/.ssh/agent.env\" . \"$HOME/.ssh/agent.env\" export SSH_AGENT_PID; export SSH_AUTH_SOCK; -" +EOF" if [[ $HOSTNAME == "elfDesktop" ]] then @@ -161,8 +161,8 @@ echo echo === install Jellyfin Server echo -run root "install Jellifin-server" "pacman -S --noconfirm jellifin-server" -run root "add media disk to fstab" "cat >>/etc/fstab <>/etc/fstab <>\"/home/$USERNAME/.local/bin/bisync_home\" <>\"/home/$USERNAME/.local/bin/bisync_home\" <>\"/home/$USERNAME/.config/rclone/bisync_home.filter\" <>\"/home/$USERNAME/.config/rclone/bisync_home.filter\" <>\"/home/$USERNAME/.config/rclo - ** EOF" -run root "rclone: pdrive backup script" "cat >>\"/home/$USERNAME/.local/bin/bisync_backup\" <>\"/home/$USERNAME/.local/bin/bisync_backup\" <>\"/home/$USERNAME/.config/rclone/bisync_backup.filter\" <>\"/home/$USERNAME/.config/rclone/bisync_backup.filter\" <>\"/home/$USERNAME/.config/rclo - /Videos/** - /.vault/** EOF" -run root "rclone: set mode to filters" "chmod 664 /home/$USERNAME/.config/rclone/*.filter" -run root "rclone: set mode to scripts" "chmod 775 /home/$USERNAME/.local/bin/bisync_*" -run root "rclone: set owner to files" "chown -R $USERNAME:$USERNAME /home/$USERNAME/.config/rclone /home/$USERNAME/.local/bin/bisync_*" +run root "rclone: set mode to filters" "chmod 664 /home/$USERNAME/.config/rclone/*.filter" +run root "rclone: set mode to scripts" "chmod 775 /home/$USERNAME/.local/bin/bisync_*" +run root "rclone: set owner to files" "chown -R $USERNAME:$USERNAME /home/$USERNAME/.config/rclone /home/$USERNAME/.local/bin/bisync_*" fi # $HOSTNAME == "elfDesktop" @@ -221,6 +221,6 @@ echo echo === clean and reboot echo -run "remove confic sources" "rm -r \"$CONFIG_DIR\"" -run "remove first boot script" "rm /first-boot.sh /first-boot.env /etc/systemd/system/first-boot.service" -run "reboot" "shutdown -r now" +run root "remove config sources" "rm -r \"$CONFIG_DIR\"" +run root "remove first boot script" "rm /first-boot.sh /first-boot.env /etc/systemd/system/first-boot.service" +run root "reboot" "shutdown -r now"