From b716c30550d9a1d3810e75f2f7bb0abae3855716 Mon Sep 17 00:00:00 2001 From: Nathan Schneider Date: Wed, 26 Feb 2020 18:12:38 +0000 Subject: [PATCH] Revised directions in README --- README.md | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 549604f..1e68a2c 100644 --- a/README.md +++ b/README.md @@ -2,23 +2,29 @@ [https://gitlab.com/ntnsndr/dotfiles/](https://gitlab.com/ntnsndr/dotfiles/) -This is a set of tools to facilitate rapid switching among Linux-based operating systems. They should be added to the home directory. Start by executing: +This is a set of tools to facilitate rapid switching among Linux-based operating systems. - .scripts/install-arch.sh +## Initial install -or +Load the dotfiles into the home directory: - .scripts/install-deb.sh + cd ~ + git clone https://gitlab.com/ntnsndr/dotfiles.git + mv ~/dotfiles/{.,}* ~/ -On local machines, to update from canonical GitLab repo: +Then execute the appropriate script. On Arch-based systems: - git pull origin master + chmod +x ~/.scripts/install-arch.sh + ~/.scripts/install-arch.sh -If there are local changes to overwrite: +On Debian-based systems: + + chmod +x ~/.scripts/install-deb.sh + ~/.scripts/install-deb.sh + +## Updating + +Do all editing on the GitLab repo, rather than locally, then update changes on local machines. On local machines, to update from canonical GitLab repo: git fetch --all git reset --hard origin/master - -To update the canonical repo with local committed changes: - - git push origin master