From dbd899a111f1e36706808e63da0ea2e7625c36b5 Mon Sep 17 00:00:00 2001
From: Cyteen May <cyteen@ring-zero.co.uk>
Date: Thu, 13 Jun 2019 11:39:33 +0100
Subject: [PATCH] Collected small changes.

---
 020_docker-compose.sh  |  1 +
 020_grc.sh             |  2 +-
 020_pycharm-install.sh |  6 +++-
 020_vcsh.sh            | 64 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/020_docker-compose.sh b/020_docker-compose.sh
index 0b24427..4992f42 100644
--- a/020_docker-compose.sh
+++ b/020_docker-compose.sh
@@ -2,6 +2,7 @@
 apt-get install docker-compose
 #dpkg -i /var/tmp/docker-compose/docker-compose_1.11.0-1_amd64.deb 
 
+# apt-get install jq checkinstall
 # PROJECT=docker/compose
 # PRERELEASE=false
 # RELEASE=$(curl "https://api.github.com/repos/${PROJECT}/releases?per_page=5" | jq -r '.[0] | select( .prerelease = false ) |.tag_name')
diff --git a/020_grc.sh b/020_grc.sh
index 496f3da..13b71ea 100644
--- a/020_grc.sh
+++ b/020_grc.sh
@@ -24,7 +24,7 @@ if [ -e /usr/bin/grc ]; then
     alias mtr="cl mtr --curses"
     alias nmap="cl nmap"
     alias ntpdate="cl ntpdate"
-    alias df="cl df -hT | column -t"
+    alias df="cl df -hT"
     alias getfcl="cl getfcl"
     alias tail="cl tail"
     alias ip="cl ip"
diff --git a/020_pycharm-install.sh b/020_pycharm-install.sh
index dd7a28b..aed7419 100644
--- a/020_pycharm-install.sh
+++ b/020_pycharm-install.sh
@@ -1,5 +1,9 @@
 ## pycharm python ide
-PYCHARM_VERSION=2018.1.4
+
+# https://en.wikipedia.org/wiki/PyCharm
+# https://www.jetbrains.com/pycharm/download/#section=linux
+# https://www.jetbrains.com/pycharm/download/download-thanks.html?platform=linux&code=PCC
+PYCHARM_VERSION=2019.1.1
 cd /var/tmp && wget -c https://download.jetbrains.com/python/pycharm-community-${PYCHARM_VERSION}.tar.gz && tar xzvf /var/tmp/pycharm-community-${PYCHARM_VERSION}.tar.gz 
 
 
diff --git a/020_vcsh.sh b/020_vcsh.sh
index 26811b0..800066e 100644
--- a/020_vcsh.sh
+++ b/020_vcsh.sh
@@ -1 +1,65 @@
+## vcsh
+# When you clone a remote repository foo, vcsh does the following behind the scene:
+# 1. create a folder in .config/vcsh/repo.d/foo.git, and export it as GIT_DIR.
+# 2. create $VCSH_BASE directory, i.e your home directory by default; and 
+#    export it as GIT_WORK_TREE
+# Thus the work tree and git meta data, aka .git folder, are separated. 
+# We can use git fetch to pull the remote repository into the GIT_DIR, and 
+# merge the changes back to the GIT_WORK_TREE.
+
+
+# To see the current remote repository.
+# "vcsh mr remote show origin"
+# "vcsh mr remote remove origin"
+# "vcsh mr remote add origin https://github.com/crazzyfool/mr.git"
+# "vcsh mr push --set-upstream origin master"
+
+# These can be aliased in the config file. See below
+
+## mr
+# To get started using mr, perhaps you already have some checked out repositories. Go into each one and run 
+
+
+# "mr register". 
+
+# Now mr has a list of them in ~/.mrconfig, which you can edit later to tune its operation.
+
+# Suppose you've cd'd to ~/src, and it has many repositories under it. To update them all, run 
+
+# "mr update".  
+# "mr commit".  commit any pending changes
+# "mr status". check the status of each,
+# "mr push".  push changes to all repositories.
+
 apt-get install -y vcsh mr
+
+mkdir -p ~/.config/mr/available.d
+mkdir -p ~/.config/mr/config.d
+
+GIT_WORK_TREE=${HOME}
+
+# Change this to your dotfiles repository
+GIT_REPO=git://github.com/RichiH/
+
+cat > ~/.config/mr/available.d/mr.vcsh <<EOF
+[$HOME/.config/vcsh/repo.d/mr.git]
+checkout = vcsh clone ${GIT_REPO}/vcsh_mr_template.git mr
+update = vcsh mr pull
+push = vcsh mr push
+status = vcsh mr status
+gc = vcsh mr gc
+EOF
+
+cat > ~/.config/mr/available.d/zsh.vcsh <<EOF
+[$HOME/.config/vcsh/repo.d/zsh.git]
+checkout = vcsh clone ${GIT_REPO}/zshrc.git zsh
+EOF
+
+cat > ~/.mrconfig <<EOF
+[DEFAULT]
+git_gc = git gc "$@"
+jobs = 5
+
+include = cat ~/.config/mr/config.d/*
+EOF
+