bootstrap.bash

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-bash os.bash
+bash system-ubuntu.bash
 bash tools.bash
 bash fonts.bash
 bash config.bash

config.d/git.bash

@@ -4,11 +4,8 @@
 
 git config --global user.name "Xavier Logerais"
 git config --global user.email "xavier@logerais.com"
-
-git config --global credential.helper cache
-
-git config --global merge.conflictstyle diff3
 git config --global rerere.enabled 1
+git config --global merge.conflictstyle diff3
 
 cat <<EOF >~/.gitignore
 ### asdf ###
@@ -22,8 +19,4 @@ cat <<EOF >~/.gitignore
 .venv
 EOF
 
-cat <<EOF >~/.gitattributes
-EOF
-
 git config --global core.excludesfile ~/.gitignore
-git config --global core.attributesfile ~/.gitattributes

fonts.bash

@@ -12,9 +12,10 @@ fonts+=("DejaVuSansMono")
 test -d "${fontdir}" || mkdir -p "${fontdir}"
 
 # Download fonts
-for font in "${fonts[@]}"; do
-  wget -q -O "/tmp/${font}.zip" "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${font}.zip" && cd "${fontdir}" && unzip -u "/tmp/${font}.zip" && rm "/tmp/${font}.zip"
+for font in "${fonts[@]}"
+do
+  wget -q -O /tmp/${font}.zip "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${font}.zip" && cd ${fontdir} && unzip -u /tmp/${font}.zip && rm /tmp/${font}.zip
 done
 
 # Refresh cache
-fc-cache --force --verbose "${fontdir}"
+fc-cache --force --verbose ${fontdir}

os.bash

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-for file in os.d/*.bash; do
-  bash $file
-done

system-ubuntu.bash

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-if (grep -q Ubuntu <(lsb_release -i)); then
+if ( grep -q Ubuntu <(lsb_release -i) )
+then
     sudo apt update
     sudo apt upgrade -y
-
+    
     sudo apt install -y coreutils grep less tar tree
     sudo apt install -y man manpages-fr manpages-fr-extra
     sudo apt install -y bash zsh fish