From 05a64416326108a8ec9503641ba865e5f2e0fd52 Mon Sep 17 00:00:00 2001 From: Marvin Steadfast Date: Wed, 6 Sep 2017 11:45:59 +0000 Subject: [PATCH] writingenv: zsh to fish --- Makefile | 2 +- writing_env/Dockerfile | 3 +-- writing_env/root/home/blog/playbooks/writing_env.yml | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f2301ff..4668d4f 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,6 @@ newpost: $(PY) $(BASEDIR)/newpost.py writingenv: - docker-compose run --rm --service-ports blog /bin/zsh + docker-compose run --rm --service-ports blog /usr/bin/fish .PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github newpost writingenv diff --git a/writing_env/Dockerfile b/writing_env/Dockerfile index b982dfd..1e605a7 100644 --- a/writing_env/Dockerfile +++ b/writing_env/Dockerfile @@ -64,8 +64,7 @@ USER blog RUN set -ex \ && git clone https://github.com/xsteadfastx/batcave.git ~/.batcave \ && ansible-playbook -i ~/.batcave/hosts ~/.batcave/shell.yml -c local --extra-vars="hosts=127.0.0.1" \ - && ansible-playbook -c local /home/blog/playbooks/writing_env.yml \ - && /bin/zsh -c "source /home/blog/.zshrc && antigen update" + && ansible-playbook -c local /home/blog/playbooks/writing_env.yml # clean up RUN set -ex \ diff --git a/writing_env/root/home/blog/playbooks/writing_env.yml b/writing_env/root/home/blog/playbooks/writing_env.yml index ba28c55..9c2384c 100644 --- a/writing_env/root/home/blog/playbooks/writing_env.yml +++ b/writing_env/root/home/blog/playbooks/writing_env.yml @@ -71,11 +71,11 @@ - name: export variables lineinfile: - dest=~/.zshrc + dest=~/.config/fish/config.fish line='{{ item }}' with_items: - - export PYTHONIOENCODING=UTF-8 - - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt + - set -gx PYTHONIOENCODING UTF-8 + - set -gx SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt - name: no git colors command: git config --global color.ui false