From 266c18e195e426f52c23324e9e53c79154ef5a0f Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Mon, 2 Oct 2023 11:33:35 +0300 Subject: [PATCH] chore(dotbot): cleanup dotbot plugins --- .gitmodules | 3 --- add-submodules.sh | 6 ++---- install | 10 +++------- tools/dotbot-snap | 1 - 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 160000 tools/dotbot-snap diff --git a/.gitmodules b/.gitmodules index b18f0d7..220053c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -42,9 +42,6 @@ [submodule "tmux/tmux-window-name"] path = config/tmux/plugins/tmux-window-name url = https://github.com/ofirgall/tmux-window-name.git -[submodule "dotbot-snap"] - path = tools/dotbot-snap - url = https://github.com/DrDynamic/dotbot-snap.git ignore = dirty [submodule "dotbot-pip"] path = tools/dotbot-pip diff --git a/add-submodules.sh b/add-submodules.sh index c30d3e0..f8d7c09 100755 --- a/add-submodules.sh +++ b/add-submodules.sh @@ -7,10 +7,6 @@ git submodule add --name dotbot-brew \ -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew git submodule add --name dotbot-include \ -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include -git submodule add --name dotbot-crontab \ - -f https://github.com/codekansas/dotbot-crontab.git tools/dotbot-crontab -git submodule add --name dotbot-snap \ - -f https://github.com/DrDynamic/dotbot-snap.git tools/dotbot-snap git submodule add --name dotbot-pip \ -f https://github.com/sobolevn/dotbot-pip.git tools/dotbot-pip @@ -36,3 +32,5 @@ git submodule add --name tmux/tmux-yank \ [ -d "config/tmux/plugins/tpm" ] && rm -rf config/tmux/plugins/tpm [ -d "config/tmux/plugins/tmux" ] && rm -rf config/tmux/plugins/tmux [ -d "config/tmux/plugins/tmux-menus" ] && rm -rf config/tmux/plugins/tmux-menus +[ -d "tools/dotbot-crontab" ] && rm -rf tools/dotbot-crontab +[ -d "tools/dotbot-snap" ] && rm -rf tools/dotbot-snap diff --git a/install b/install index 7ef91cc..d8be31f 100755 --- a/install +++ b/install @@ -18,8 +18,6 @@ git submodule update --init --recursive "${DOTBOT_DIR}" -d "${BASEDIR}" \ --plugin-dir=tools/dotbot-brew \ --plugin-dir=tools/dotbot-include \ - --plugin-dir=tools/dotbot-crontab \ - --plugin-dir=tools/dotbot-snap \ --plugin-dir=tools/dotbot-pip \ -c "${CONFIG}" \ "${@}" @@ -27,14 +25,12 @@ git submodule update --init --recursive "${DOTBOT_DIR}" if [ "${DOTBOT_HOST}" != "" ]; then DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}" echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}" - [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \ - && echo "(!) Found $DOTBOT_HOST_CONFIG" \ - && "$DOTBOT_BIN_PATH" \ + [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] && + echo "(!) Found $DOTBOT_HOST_CONFIG" && + "$DOTBOT_BIN_PATH" \ -d "$BASEDIR" \ --plugin-dir=tools/dotbot-brew \ --plugin-dir=tools/dotbot-include \ - --plugin-dir=tools/dotbot-crontab \ - --plugin-dir=tools/dotbot-snap \ --plugin-dir=tools/dotbot-pip \ -c "$DOTBOT_HOST_CONFIG" \ "${@}" diff --git a/tools/dotbot-snap b/tools/dotbot-snap deleted file mode 160000 index 5722c4e..0000000 --- a/tools/dotbot-snap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5722c4e5afaa56cdccc9e5be628a69d3f17b815f