From fd967103216b3a50afcaab2881bd3b693fbc4d95 Mon Sep 17 00:00:00 2001 From: Laily Date: Sat, 8 Jun 2024 16:24:22 +0800 Subject: [PATCH] fix: modify fish/git init script --- fish/install.sh | 4 ---- script/fish-init.sh | 16 ++++++++++++++++ script/fish-set-default.sh | 4 ---- script/git-init.sh | 9 +++++++++ 4 files changed, 25 insertions(+), 8 deletions(-) delete mode 100644 fish/install.sh create mode 100644 script/fish-init.sh delete mode 100755 script/fish-set-default.sh create mode 100644 script/git-init.sh diff --git a/fish/install.sh b/fish/install.sh deleted file mode 100644 index 53a97e3..0000000 --- a/fish/install.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -f "$HOME/.config/fish/config.fish" ]; then - mv $HOME/.config/fish/config.fish $HOME/.config/fish/config.fish.bak -fi -ln -s $HOME/.dotfile/fish/config.fish $HOME/.config/fish/config.fish diff --git a/script/fish-init.sh b/script/fish-init.sh new file mode 100644 index 0000000..4f621b3 --- /dev/null +++ b/script/fish-init.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +echo 'Link fish config file' +if [ -f "$HOME/.config/fish/config.fish" ]; then + mv $HOME/.config/fish/config.fish $HOME/.config/fish/config.fish.bak +fi +ln -s $HOME/.dotfile/fish/config.fish $HOME/.config/fish/config.fish + +echo 'Sourcing' +source ~/.config/fish/config.fish + +echo 'Set fish as default shell' +fishpath=$(which fish) +echo $fishpath | sudo tee -a /etc/shells +chsh -s $fishpath + diff --git a/script/fish-set-default.sh b/script/fish-set-default.sh deleted file mode 100755 index ae4ad69..0000000 --- a/script/fish-set-default.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo /usr/local/bin/fish | sudo tee -a /etc/shells -chsh -s /usr/local/bin/fish diff --git a/script/git-init.sh b/script/git-init.sh new file mode 100644 index 0000000..b9e0e30 --- /dev/null +++ b/script/git-init.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +echo 'Init git config' +src=$HOME/.gitconfig +if [ -f $src ]; then + mv $src $src.bak +fi +ln -s $HOME/.dotfile/git/.gitconfig $src +