diff --git a/.gitignore b/.gitignore index d62f8af..9761a2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/venv/ /*.bundle diff --git a/Makefile b/Makefile index 578d375..1db0488 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,15 @@ -DISTRO := $(shell . /etc/os-release && echo $$NAME) - -venv = ./venv -requirements = requirements.txt -activate = . $(venv)/bin/activate -pip = pip - -ifeq ($(DISTRO),Ubuntu) - ansible_run = $(activate) && ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS} -else - ansible_run =ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS} -endif +ansible_run = ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS} .PHONY: all -all: | venv +all: $(ansible_run) .PHONY: config -config: | venv +config: $(ansible_run) --skip-tags system-update .PHONY: system-update -system-update: venv +system-update: $(ansible_run) --tags system-update .PHONY: reboot @@ -35,30 +24,13 @@ poweroff: weekend: | update poweroff .PHONY: packages -packages: venv +packages: $(ansible_run) --tags packages .PHONY: dotfiles -dotfiles: venv +dotfiles: $(ansible_run) --tags dotfiles -.PHONY: clean -clean: - rm -rf venv - .PHONY: test test: ./test-in-docker.sh - -ifeq ($(DISTRO), Ubuntux) -venv: - python3 -m venv $(venv) - $(activate) && $(pip) install -r $(requirements) -else -venv: - true -endif - -.PHONY: freeze -freeze: - $(activate) && $(pip) freeze > $(requirements) diff --git a/install.sh b/install.sh index 21ff00b..10ba9ce 100755 --- a/install.sh +++ b/install.sh @@ -77,19 +77,13 @@ if ! command -v make >/dev/null ; then printf 'Done\n' fi -# Required for compiling modules in venv. -if ! command -v gcc >/dev/null ; then - printf 'gcc not installed, installing ...\n' - _install "gcc" - printf 'Done\n' -fi - if [[ $NAME == "Arch Linux" ]] ; then _install "ansible" fi if [[ $NAME == "Ubuntu" ]] ; then - _install "python3-venv" + _install "ansible" + _install "python3-jmespath" fi cd "$DOTDIR" && make diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9ac8e7f..0000000 --- a/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -ansible==4.6.0 -ansible-core==2.11.5 -cffi==1.14.6 -cryptography==35.0.0 -Jinja2==3.0.1 -jmespath==0.10.0 -MarkupSafe==2.0.1 -packaging==21.0 -pycparser==2.20 -pyparsing==2.4.7 -PyYAML==5.4.1 -resolvelib==0.5.4