diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 32e84fa..964bbd1 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -39,7 +39,7 @@ user = matir # Site specific config -[url "https://www.github.com/"] +[url "https://github.com./"] insteadOf = "github:" insteadOf = "github://" diff --git a/install.sh b/install.sh index 58068ec..449719a 100755 --- a/install.sh +++ b/install.sh @@ -320,15 +320,19 @@ verbose() { # Operations -install_main() { - test $MINIMAL = 1 || prerequisites - test $INSTALL_PKGS = 1 && is_deb_system && install_apt_pkgs +install_dotfiles() { install_dotfile_dir "${BASEDIR}/dotfiles" test -d "${BASEDIR}/private_dotfiles" && \ test -d "${BASEDIR}/.git/git-crypt" && \ install_dotfile_dir "${BASEDIR}/private_dotfiles" test -d "${BASEDIR}/local_dotfiles" && \ install_dotfile_dir "${BASEDIR}/local_dotfiles" +} + +install_main() { + test $MINIMAL = 1 || prerequisites + test $INSTALL_PKGS = 1 && is_deb_system && install_apt_pkgs + install_dotfiles install_basic_dir "${BASEDIR}/bin" "${HOME}/bin" test $MINIMAL = 1 || postinstall test $INSTALL_KEYS = 1 && install_keys @@ -372,6 +376,9 @@ case $OPERATION in install) install_main ;; + dotfiles) + install_dotfiles + ;; package*) if [ ${2:-default} != default ] ; then install_pkg_set packages.${2}