From 6d45a204cb1e0f54357113c8f8a0eb2551216b3f Mon Sep 17 00:00:00 2001
From: Marvin Steadfast <marvin@xsteadfastx.org>
Date: Fri, 15 Dec 2017 19:43:08 +0100
Subject: [PATCH] moving writingenv from fish to xonsh

---
 Makefile                                             | 2 +-
 docker-compose.yml                                   | 1 +
 writing_env/root/home/blog/playbooks/writing_env.yml | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4668d4f..03ae747 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,6 @@ newpost:
 	$(PY) $(BASEDIR)/newpost.py
 
 writingenv:
-	docker-compose run --rm --service-ports blog /usr/bin/fish
+	docker-compose run --rm --service-ports blog /opt/xonsh/bin/xonsh
 
 .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/docker-compose.yml b/docker-compose.yml
index f85ce5e..a576c4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     environment:
       - BLOG_UID=1000
       - BLOG_GID=1000
+      - USER=blog
     volumes:
       - $PWD:/blog
       - $HOME/.ssh:/home/blog/.ssh
diff --git a/writing_env/root/home/blog/playbooks/writing_env.yml b/writing_env/root/home/blog/playbooks/writing_env.yml
index e5d562a..b0143e8 100644
--- a/writing_env/root/home/blog/playbooks/writing_env.yml
+++ b/writing_env/root/home/blog/playbooks/writing_env.yml
@@ -74,11 +74,11 @@
 
     - name: export variables
       lineinfile:
-        dest=~/.config/fish/config.fish
+        dest=~/.xonshrc
         line='{{ item }}'
       with_items:
-        - set -gx PYTHONIOENCODING UTF-8
-        - set -gx SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
+        - $PYTHONIOENCODING = 'UTF-8'
+        - $SSL_CERT_FILE = '/etc/ssl/certs/ca-certificates.crt'
 
     - name: no git colors
       command: git config --global color.ui false