diff --git a/default.dotbot.yaml b/dotbot.default.yaml similarity index 86% rename from default.dotbot.yaml rename to dotbot.default.yaml index 4c1c8cf..5b47f91 100644 --- a/default.dotbot.yaml +++ b/dotbot.default.yaml @@ -1,6 +1,3 @@ -## TODO: -## cask_personal using some variable? - - defaults: link: relink: true @@ -64,11 +61,16 @@ - stdin: true stdout: true + stderr: true command: > if [ "$(uname)" = "Darwin" ]; then - ./macos/install_brew.sh - brew install zsh - sudo chsh -s $(brew --prefix)/bin/zsh - brew bundle --file ./macos/Brewfile - brew bundle --file ./macos/Caskfile + ./install_macos.sh + fi + + - stdin: true + stdout: true + stderr: true + command: > + if [ "$(uname)" = "Linux" ]; then + ./install_linux.sh fi diff --git a/personal.dotbot.yaml b/dotbot.personal.yaml similarity index 100% rename from personal.dotbot.yaml rename to dotbot.personal.yaml diff --git a/setup.dotbot.yaml b/dotbot.setup-once.yaml similarity index 100% rename from setup.dotbot.yaml rename to dotbot.setup-once.yaml diff --git a/install b/install index 8e5ac2d..0060b48 100755 --- a/install +++ b/install @@ -2,8 +2,9 @@ set -e -DEFAULT_CONFIG_PREFIX="default" -CONFIG_SUFFIX=".dotbot.yaml" +DEFAULT_CONFIG="default" +CONFIG_PREFIX="dotbot" +CONFIG_SUFFIX="yaml" DOTBOT_DIR="dotbot" DOTBOT_BIN="bin/dotbot" @@ -13,7 +14,8 @@ cd "${BASEDIR}" git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive git submodule update --init --recursive "${DOTBOT_DIR}" -for conf in ${DEFAULT_CONFIG_PREFIX} ${@}; do - "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${conf}${CONFIG_SUFFIX}" +for conf in ${DEFAULT_CONFIG} ${@}; do + "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG_PREFIX}.${conf}.${CONFIG_SUFFIX}" done -"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" + +# "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"