matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://www.github.com/Matir/skel

Browse Source
This commit is contained in:
David Tomaschik
2018-02-18 12:54:10 -08:00
parent 4a7b263a9e 753035cc57
commit 89f555cdcb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/gitconfig
View File

@@ -39,7 +39,7 @@
user = matir user = matir
# Site specific config # Site specific config
[url "https://www.github.com/"] [url "https://github.com./"]
insteadOf = "github:" insteadOf = "github:"
insteadOf = "github://" insteadOf = "github://"

13
install.sh
View File

@@ -320,15 +320,19 @@ verbose() {
# Operations # Operations
install_main() { install_dotfiles() {
test $MINIMAL = 1 || prerequisites
test $INSTALL_PKGS = 1 && is_deb_system && install_apt_pkgs
install_dotfile_dir "${BASEDIR}/dotfiles" install_dotfile_dir "${BASEDIR}/dotfiles"
test -d "${BASEDIR}/private_dotfiles" && \ test -d "${BASEDIR}/private_dotfiles" && \
test -d "${BASEDIR}/.git/git-crypt" && \ test -d "${BASEDIR}/.git/git-crypt" && \
install_dotfile_dir "${BASEDIR}/private_dotfiles" install_dotfile_dir "${BASEDIR}/private_dotfiles"
test -d "${BASEDIR}/local_dotfiles" && \ test -d "${BASEDIR}/local_dotfiles" && \
install_dotfile_dir "${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" install_basic_dir "${BASEDIR}/bin" "${HOME}/bin"
test $MINIMAL = 1 || postinstall test $MINIMAL = 1 || postinstall
test $INSTALL_KEYS = 1 && install_keys test $INSTALL_KEYS = 1 && install_keys
@@ -372,6 +376,9 @@ case $OPERATION in
install) install)
install_main install_main
;; ;;
dotfiles)
install_dotfiles
;;
package*) package*)
if [ ${2:-default} != default ] ; then if [ ${2:-default} != default ] ; then
install_pkg_set packages.${2} install_pkg_set packages.${2}