From dd8263eaacea3896ac113b5e13a61a28fee2d06e Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Tue, 28 Mar 2023 19:16:12 +0200 Subject: [PATCH] cleanup --- .local/bin/dotsync | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.local/bin/dotsync b/.local/bin/dotsync index 4f79e2273..bc970f1ee 100755 --- a/.local/bin/dotsync +++ b/.local/bin/dotsync @@ -6,10 +6,10 @@ RED='\033[1;30m' NC='\033[0m' dotfiles="${1:-$HOME/.dotfiles}" -echo "${BLUE}Using $dotfiles as dotfiles directory!${NC}" +echo "${BLUE}Changing directory to $dotfiles${NC}" if ! cd "$dotfiles"; then - echo "${RED}Could not CD into $dotfiles${NC}" - exit + echo "${RED}Could not CD into $dotfiles${NC}" + exit fi echo @@ -17,7 +17,7 @@ echo "${BLUE}Stashing existing changes...${NC}" stash_result=$(git stash push -m "sync-dotfiles: Before syncing dotfiles") needs_pop=1 if [ "$stash_result" = "No local changes to save" ]; then - needs_pop=0 + needs_pop=0 fi echo @@ -26,27 +26,23 @@ git pull origin main echo if [ $needs_pop -eq 1 ]; then - echo "${BLUE}Popping stashed changes...${NC}" - git stash pop + echo "${BLUE}Popping stashed changes...${NC}" + git stash pop fi echo unmerged_files=$(git diff --name-only --diff-filter=U) if [ -n "$unmerged_files" ]; then - echo "${RED}The following files have merge conflicts after popping the stash:${NC}" - echo - printf %"s\n" "$unmerged_files" + echo "${RED}The following files have merge conflicts after popping the stash:${NC}" + echo + printf %"s\n" "$unmerged_files" else - stow -t "$HOME" . + stow -t "$HOME" . fi echo "${BLUE}Generating librewolf profiles...${NC}" -if ! cd "$dotfiles/.librewolf"; then - "${RED}Could not CD into $HOME/.librewolf${NC}" - exit -fi -envsubst < installs.template > $HOME/.librewolf/installs.ini -envsubst < profiles.template > $HOME/.librewolf/profiles.ini +envsubst <.librewolf/installs.template >$HOME/.librewolf/installs.ini +envsubst <.librewolf/profiles.template >$HOME/.librewolf/profiles.ini echo echo "${GREEN}Dotfiles Synced Successfully!${NC}"