From bee6af8541a41bb9e813fb1868a7db67be1f3f1b Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 17 Sep 2018 16:09:50 +0100 Subject: [PATCH 1/4] Remove old patch --- makepkg.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 makepkg.patch diff --git a/makepkg.patch b/makepkg.patch deleted file mode 100644 index 5663f31..0000000 --- a/makepkg.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** /usr/bin/makepkg 2018-05-29 09:10:22.097063834 +0100 ---- /usr/bin/makepkg.orig 2018-05-29 09:08:25.916705962 +0100 -*************** -*** 1403,1409 **** - if (( EUID == 0 )); then - error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ - catastrophic damage to your system.")" "makepkg" -! # exit $E_ROOT - fi - else - if [[ -z $FAKEROOTKEY ]]; then ---- 1403,1409 ---- - if (( EUID == 0 )); then - error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ - catastrophic damage to your system.")" "makepkg" -! exit $E_ROOT - fi - else - if [[ -z $FAKEROOTKEY ]]; then From 1d7c789ecdbfbdd6108e4b0ca69d7e0c690fc765 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 17 Sep 2018 16:10:10 +0100 Subject: [PATCH 2/4] Remove old puppet lint file --- .puppet-lint.rc | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .puppet-lint.rc diff --git a/.puppet-lint.rc b/.puppet-lint.rc deleted file mode 100644 index 1de88dc..0000000 --- a/.puppet-lint.rc +++ /dev/null @@ -1,4 +0,0 @@ ---fail-on-warnings ---no-arrow-alignment-check ---no-documentation-check ---no-variables_not_enclosed-check From ba8a1046d2d0fc07eb4fc5450ee6400b48263c51 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 17 Sep 2018 16:10:34 +0100 Subject: [PATCH 3/4] Remove gitmodules dir --- .gitmodules | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d6fbe9b..0000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "modules/vcsrepo"] - path = modules/vcsrepo - url = https://github.com/puppetlabs/puppetlabs-vcsrepo -[submodule "modules/concat"] - path = modules/concat - url = https://github.com/puppetlabs/puppetlabs-concat -[submodule "modules/stdlib"] - path = modules/stdlib - url = https://github.com/puppetlabs/puppetlabs-stdlib From 1b209abd30ddd216282e36f1c6b3cce6426629e7 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 17 Sep 2018 16:12:14 +0100 Subject: [PATCH 4/4] Update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 67c0c73..d42acd9 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# dotfiles +# Dotfiles [![CircleCI](https://circleci.com/gh/RealOrangeOne/dotfiles.svg?style=svg)](https://circleci.com/gh/RealOrangeOne/dotfiles) Settings and Preferences for transfer between machines ## Requirements -- `puppet` -- `~/.dotfiles` repo from private +- `pipenv` +- Correctly setup `~/.dotfiles` directory ## Usage -1. run `deploy.sh` as root +1. Run `pipenv run deploy` 2. ??? 3. Profit!