diff --git a/dotbot b/.dotbot similarity index 100% rename from dotbot rename to .dotbot diff --git a/.gitmodules b/.gitmodules index b7f31bc..e34dfa4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "dotbot"] - path = dotbot + path = .dotbot url = https://github.com/anishathalye/dotbot [submodule "password-store"] - path = password-store + path = .password-store url = https://git.zx2c4.com/password-store diff --git a/install.conf.yaml b/.install.conf.yaml similarity index 100% rename from install.conf.yaml rename to .install.conf.yaml diff --git a/password-store b/.password-store similarity index 100% rename from password-store rename to .password-store diff --git a/bash/bash.d/password-store b/bash/bash.d/password-store index c8cb3b3..b9fd7af 100644 --- a/bash/bash.d/password-store +++ b/bash/bash.d/password-store @@ -1,6 +1,6 @@ # Enable password-storage and its bash completion -PASSDIR="${DOTFILES}/password-store" +PASSDIR="${DOTFILES}/.password-store" # Only do this when the submodule is loaded if [ -d "${PASSDIR}/src" ]; then diff --git a/install.sh b/install.sh index 71b23a5..e27aea9 100755 --- a/install.sh +++ b/install.sh @@ -2,14 +2,14 @@ set -e -CONFIG="install.conf.yaml" -DOTBOT_DIR="dotbot" +CONFIG=".install.conf.yaml" +DOTBOT_DIR=".dotbot" DOTBOT_BIN="bin/dotbot" BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "${BASEDIR}" -git pull +git pull || echo "Pulling from remote failed" git submodule update --init --recursive "${DOTBOT_DIR}" "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"