aboutsummaryrefslogtreecommitdiff
path: root/install.sh
diff options
context:
space:
mode:
authorsrdusr <trevorgray@srdusr.com>2024-05-16 03:53:35 +0200
committersrdusr <trevorgray@srdusr.com>2024-05-16 03:53:35 +0200
commitbcf091bcc75488767484ae0b5e7f08f5e2cee7b9 (patch)
tree66c0220c844bf23e08604ba15c1ec8634c969779 /install.sh
parent7f744cdac035909b65ee1444beba7747d76105ac (diff)
downloaddotfiles-bcf091bcc75488767484ae0b5e7f08f5e2cee7b9.tar.gz
dotfiles-bcf091bcc75488767484ae0b5e7f08f5e2cee7b9.zip
Update install.sh with many changes (linux)
Diffstat (limited to 'install.sh')
-rwxr-xr-xinstall.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/install.sh b/install.sh
index 4496715..8c72224 100755
--- a/install.sh
+++ b/install.sh
@@ -125,16 +125,13 @@ install_zsh_plugins() {
# Common Sources/Dependencies
#======================================
echo ".cfg" >>.gitignore
-
-function config() {
- /usr/bin/git --git-dir="$HOME/.cfg/" --work-tree="$HOME" "$@" || handle_error "Git command failed: $*"
-}
+echo ".install.sh" >>.gitignore
# Dotfiles
-git clone --bare "$dotfiles_url" "$HOME"/.dotfiles
+git clone --bare "$dotfiles_url" "$HOME"/.cfg
function config {
- git --git-dir="$HOME"/.dotfiles/ --work-tree="$HOME" "$@"
+ git --git-dir="$HOME"/.cfg/ --work-tree="$HOME" "$@"
}
std_err_output=$(config checkout 2>&1 >/dev/null) || true
@@ -144,12 +141,12 @@ if [[ $std_err_output == *"following untracked working tree files would be overw
config checkout 2>&1 |
egrep "\s+\." |
awk {'print $1'} |
- xargs -I% sh -c "mkdir -p '.dotfiles-backup/%'; mv % .dotfiles-backup/%"
+ xargs -I% sh -c "mkdir -p '.cfg-backup/%'; mv % .cfg-backup/%"
fi
config checkout
if [ $? == 0 ]; then
- echo "Successfully backed up conflicting dotfiles in .dotfiles-backup/. and imported dotfiles."
+ echo "Successfully backed up conflicting dotfiles in .cfg-backup/. and imported.cfg."
else
echo "Mission failed."
fi