From 380b4556ffedfadfcbbec18140fde6caffdc9c43 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Mon, 9 Aug 2021 00:38:07 +0200
Subject: [PATCH] bootstrap: remove .sh ending where not needed

---
 bootstrap          | 41 +++++++++++++++++++++--------------------
 files/bash_profile |  2 +-
 files/bashrc       |  2 +-
 files/zshrc        |  2 +-
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/bootstrap b/bootstrap
index c0bb381..94ed35e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -52,26 +52,27 @@ ${XDG_DATA_HOME}/nvim/shada
 EOF
 )
 
+FILES="$DOTFILES_DIR/files"
 DOTFILES=$(cat <<EOF
-${XDG_CONFIG_HOME}/alacritty/alacritty.yml  files/alacritty.yml
-${XDG_CONFIG_HOME}/git/config               files/gitconfig
-${XDG_CONFIG_HOME}/git/ignore               files/gitignore
-${XDG_CONFIG_HOME}/readline/inputrc         files/inputrc
-${XDG_CONFIG_HOME}/mintty/config            files/minttyrc
-${XDG_CONFIG_HOME}/nvim/autoload/plug.vim   files/plug.vim
-${XDG_CONFIG_HOME}/python/startup.py        files/python-startup.py
-${XDG_CONFIG_HOME}/tmux/tmux.conf           files/tmux.conf
-${XDG_CONFIG_HOME}/nvim/init.vim            files/init.vim
-${XDG_CONFIG_HOME}/shell/aliases.sh         files/aliases.sh
-${XDG_CONFIG_HOME}/shell/profile.sh         files/profile.sh
-${XDG_CONFIG_HOME}/zsh/.zshrc               files/zshrc
-${HOME}/.XCompose                           files/xcompose
-${HOME}/.bashrc                             files/bashrc
-${HOME}/.bash_profile                       files/bash_profile
-${HOME}/.jupyter/custom/custom.js           files/jupyter_custom.js
-${HOME}/.jupyter/nbconfig/notebook.json     files/jupyter_notebook.json
-${HOME}/.zshenv                             files/profile.sh
-${HOME}/.ssh/config                         files/ssh_config
+${XDG_CONFIG_HOME}/alacritty/alacritty.yml  $FILES/alacritty.yml
+${XDG_CONFIG_HOME}/git/config               $FILES/gitconfig
+${XDG_CONFIG_HOME}/git/ignore               $FILES/gitignore
+${XDG_CONFIG_HOME}/readline/inputrc         $FILES/inputrc
+${XDG_CONFIG_HOME}/mintty/config            $FILES/minttyrc
+${XDG_CONFIG_HOME}/nvim/autoload/plug.vim   $FILES/plug.vim
+${XDG_CONFIG_HOME}/python/startup.py        $FILES/python-startup.py
+${XDG_CONFIG_HOME}/tmux/tmux.conf           $FILES/tmux.conf
+${XDG_CONFIG_HOME}/nvim/init.vim            $FILES/init.vim
+${XDG_CONFIG_HOME}/shell/aliases            $FILES/aliases.sh
+${XDG_CONFIG_HOME}/shell/profile            $FILES/profile.sh
+${XDG_CONFIG_HOME}/zsh/.zshrc               $FILES/zshrc
+${HOME}/.XCompose                           $FILES/xcompose
+${HOME}/.bashrc                             $FILES/bashrc
+${HOME}/.bash_profile                       $FILES/bash_profile
+${HOME}/.jupyter/custom/custom.js           $FILES/jupyter_custom.js
+${HOME}/.jupyter/nbconfig/notebook.json     $FILES/jupyter_notebook.json
+${HOME}/.zprofile                           ${XDG_CONFIG_HOME}/shell/profile
+${HOME}/.ssh/config                         $FILES/ssh_config
 EOF
 )
 
@@ -170,7 +171,7 @@ task_ensure_directories() {
 task_link_dotfiles() {
     heading "Link dotfiles"
     echo "$DOTFILES" | while read -r src dest; do
-        file_link "$src" "$DOTFILES_DIR/$dest"
+        file_link "$src" "$dest"
     done
 }
 
diff --git a/files/bash_profile b/files/bash_profile
index 2d86810..bead643 100644
--- a/files/bash_profile
+++ b/files/bash_profile
@@ -3,6 +3,6 @@
 # Source:
 #   1. profile if present (XDG_CONFIG_HOME is not defined yet)
 #   2. ~/.bashrc if shell is interactive.
-[ -f "${HOME}/.config/shell/profile.sh" ] && source "${HOME}/.config/shell/profile.sh"
+[ -f "${HOME}/.config/shell/profile" ] && source "${HOME}/.config/shell/profile"
 [[ "$-" == *i* ]] && [ -f "${HOME}/.bashrc" ] && source "${HOME}/.bashrc"
 
diff --git a/files/bashrc b/files/bashrc
index d7bb5b3..7069559 100644
--- a/files/bashrc
+++ b/files/bashrc
@@ -13,7 +13,7 @@ HISTSIZE=
 HISTTIMEFORMAT="[%F %T] "
 HISTFILE="$XDG_DATA_HOME/bash/history"
 
-[ -f "${XDG_CONFIG_HOME}/shell/aliases.sh" ] && source "${XDG_CONFIG_HOME}/shell/aliases.sh"
+[ -f "${XDG_CONFIG_HOME}/shell/aliases" ] && source "${XDG_CONFIG_HOME}/shell/aliases"
 
 Reset="\[$(tput sgr0)\]"
 PS1_EXIT="\[$(tput setaf      "$Red"    )\]"  # color for last exit code if non-zero
diff --git a/files/zshrc b/files/zshrc
index 60a2b0a..21c1ed5 100644
--- a/files/zshrc
+++ b/files/zshrc
@@ -3,5 +3,5 @@
 
 stty stop undef # Prevent ctrl-s from freezing the terminal.
 
-[ -f "${XDG_CONFIG_HOME}/shell/aliases.sh" ] && source "${XDG_CONFIG_HOME}/shell/aliases.sh"
+[ -f "${XDG_CONFIG_HOME}/shell/aliases" ] && source "${XDG_CONFIG_HOME}/shell/aliases"