LailaTheElf/ElfOS
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fix more bugs

Browse Source
This commit is contained in:
Laila van Reenen 2024-12-13 22:04:07 +01:00
parent e328bd81d5
commit 1d702fe145
Signed by: LailaTheElf
GPG Key ID: 1F4E6EE3E6DDF769
2 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elf_os.sh
View File

@ -168,7 +168,7 @@ run "create fist boot config" "cat >/mnt/first-boot.env <<EOF
USERNAME=$USERNAME
HOSTNAME=$HOSTNAME
CONFIG_DIR=/opt/elfOS_configFiles
LOG_FILE=/var/logs/elfOS/first-boot.log
LOG_FILE=/var/log/elfOS/first-boot.log
EOF
"
run "set access fist boot script" "chmod 700 /mnt/first-boot.env"
@ -178,6 +178,7 @@ Description=first boot install script
[Service]
Type=simple
StandardOutput=journal+console
ExecStart=/first-boot.sh
[Install]

52
first-boot.sh
View File

@ -5,17 +5,17 @@
function run(){
if [ "$1" = "root" ]
then
box=""
prefix=""
else
box="sudo -u $USERNAME distrobox enter --name $1 --"
prefix="sudo -u $1"
fi
echo "[ ] $1: $2"
echo "# $2" >>"$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
}
@ -49,16 +49,16 @@ ${HOME_IP} nodered.cool.freenen.nl
EOF
"
run root "create home dirs" "sudo -u $USERNAME mkdir -p \
run "$USERNAME" "create home dirs" "mkdir -p \
/home/$USERNAME/.local/python-env \
/home/$USERNAME/.ssh \
/home/$USERNAME/projects \
/home/$USERNAME/.local/share/flatpak/overrides/"
# run ubuntu "create python env" "python3 -m venv /home/$USERNAME/.local/python-env"
run root "copy ssh config" "sudo -u $USERNAME cp $CONFIG_DIR/sshConfig /home/$USERNAME/.ssh/config"
run root "copy git config" "sudo -u $USERNAME cp $CONFIG_DIR/gitconfig /home/$USERNAME/.gitconfig"
run root "copy vim config" "sudo -u $USERNAME cp $CONFIG_DIR/vimrc /home/$USERNAME/.vimrc"
run root "copy vim config" "sudo -u $USERNAME cp $CONFIG_DIR/auto_clone.sh /home/$USERNAME/projects/auto_clone.sh"
run "$USERNAME" "copy ssh config" "cp $CONFIG_DIR/sshConfig /home/$USERNAME/.ssh/config"
run "$USERNAME" "copy git config" "cp $CONFIG_DIR/gitconfig /home/$USERNAME/.gitconfig"
run "$USERNAME" "copy vim config" "cp $CONFIG_DIR/vimrc /home/$USERNAME/.vimrc"
run "$USERNAME" "copy vim config" "cp $CONFIG_DIR/auto_clone.sh /home/$USERNAME/projects/auto_clone.sh"
run root "update polkit" "sed --in-place -e 's/wheel/admin/g' /usr/share/polkit-1/rules.d/50-default.rules"
run root "update fail lock" "sed --in-place -e 's/^deny = .*$/deny = 10/' -e 's/^unlock_time = .*$/unlock_time = 60/' /etc/security/faillock.conf"
@ -111,13 +111,13 @@ echo === install vscodium
echo
run root "vscodium: install libxss" "pacman -S --noconfirm libxss"
run root "vscodium: clone from AUR" "sudo -u $USERNAME git clone https://aur.archlinux.org/vscodium-bin.git /tmp/vscodium-bin"
run root "vscodium: build backage" "cd /tmp/vscodium-bin/ && sudo -u $USERNAME makepkg"
run "$USERNAME" "vscodium: clone from AUR" "git clone https://aur.archlinux.org/vscodium-bin.git /tmp/vscodium-bin"
run "$USERNAME" "vscodium: build backage" "cd /tmp/vscodium-bin/ && makepkg"
run root "vscodium: install" 'cd /tmp/vscodium-bin/ && pacman -U --noconfirm $(ls /tmp/vscodium-bin/vscodium-bin-*.pkg.tar.zst)'
run root "vscodium: add extention: clangd" "sudo -u $USERNAME codium --install-extension llvm-vs-code-extensions.vscode-clangd"
run root "vscodium: add extention: git-graph" "sudo -u $USERNAME codium --install-extension mhutchie.git-graph"
run root "vscodium: add extention: cmake" "sudo -u $USERNAME codium --install-extension twxs.cmake"
run "$USERNAME" "vscodium: add extention: clangd" "codium --install-extension llvm-vs-code-extensions.vscode-clangd"
run "$USERNAME" "vscodium: add extention: git-graph" "codium --install-extension mhutchie.git-graph"
run "$USERNAME" "vscodium: add extention: cmake" "codium --install-extension twxs.cmake"
# run root "install theros deps" "/home/$USERNAME/.local/python-env/bin/python3 -m pip teroshdl"
# run root "vscodium: add theros" "codium --install-extension teros-technology.teroshdl"
@ -126,12 +126,12 @@ echo === install esp-idf
echo
run root "install esp-idf deps" "pacman -S --noconfirm flex bison gperf ninja ccache libffi dfu-util libusb"
run root "create folder for esp-idf" "sudo -u $USERNAME mkdir /home/$USERNAME/.local/espressif"
run root "clone idf-extra-components" "sudo -u $USERNAME git clone https://github.com/espressif/esp-idf.git /home/$USERNAME/.local/espressif/esp-idf"
run root "clone esp-idf" "sudo -u $USERNAME git clone https://github.com/espressif/idf-extra-components.git /home/$USERNAME/.local/espressif/idf-extra-components"
run root "clone esp-protocols" "sudo -u $USERNAME git clone https://github.com/espressif/esp-protocols.git /home/$USERNAME/.local/espressif/esp-protocols"
run root "clone esp-zigbee-sdk" "sudo -u $USERNAME git clone https://github.com/espressif/esp-zigbee-sdk.git /home/$USERNAME/.local/espressif/esp-zigbee-sdk"
run root "install esp-idf" "sudo -u $USERNAME bash -c \"IDF_TOOLS_PATH=/home/$USERNAME/.local/espressif /home/$USERNAME/.local/espressif/esp-idf/install.sh all\""
run "$USERNAME" "create folder for esp-idf" "mkdir /home/$USERNAME/.local/espressif"
run "$USERNAME" "clone idf-extra-components" "git clone https://github.com/espressif/esp-idf.git /home/$USERNAME/.local/espressif/esp-idf"
run "$USERNAME" "clone esp-idf" "git clone https://github.com/espressif/idf-extra-components.git /home/$USERNAME/.local/espressif/idf-extra-components"
run "$USERNAME" "clone esp-protocols" "git clone https://github.com/espressif/esp-protocols.git /home/$USERNAME/.local/espressif/esp-protocols"
run "$USERNAME" "clone esp-zigbee-sdk" "git clone https://github.com/espressif/esp-zigbee-sdk.git /home/$USERNAME/.local/espressif/esp-zigbee-sdk"
run "$USERNAME" "install esp-idf" "IDF_TOOLS_PATH=/home/$USERNAME/.local/espressif /home/$USERNAME/.local/espressif/esp-idf/install.sh all"
echo
echo === install other software
@ -152,7 +152,7 @@ ps -p $SSH_AGENT_PID >/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
@ -174,7 +174,7 @@ echo === install rclone
echo
run root "install rclone" "pacman -S --noconfirm rclone"
run root "rclone: make config dir" "mkdir -p \"/home/$USERNAME/.config/rclone/\""
run "$USERNAME" "rclone: make config dir" "mkdir -p \"/home/$USERNAME/.config/rclone/\""
run root "rclone: pdrive home script" "cat >>\"/home/$USERNAME/.local/bin/bisync_home\" <<EOF
#/bin/bash
@ -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"