Merge pull request #1 from jamieleecho/update-cmoc-converters

Misc updates

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:16.04
 
-MAINTAINER Jamie Cho version: 0.8
+MAINTAINER Jamie Cho version: 0.10
 
 # Setup sources
 RUN apt-get update && apt-get install -y \
@@ -38,27 +38,29 @@ RUN add-apt-repository ppa:tormodvolden/m6809
 RUN echo deb http://ppa.launchpad.net/tormodvolden/m6809/ubuntu trusty main >> /etc/apt/sources.list.d/tormodvolden-m6809-trusty.list && \
   echo deb http://ppa.launchpad.net/tormodvolden/m6809/ubuntu precise main >> /etc/apt/sources.list.d/tormodvolden-m6809-trusty.list
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
-  cmoc=0.1.52-0~tormod \
+  cmoc=0.1.53-0~tormod \
   gcc6809=4.6.4-0~lw9a~trusty \
   lwtools=4.15-0~tormod~trusty \
   toolshed=2.2-0~tormod
 
 # Install CoCo image conversion scripts
-COPY scripts/* /usr/local/bin/
+WORKDIR /root
+RUN git config --global core.autocrlf input && \
+  git clone https://github.com/jamieleecho/coco-tools.git && \
+  (cd coco-tools && python setup.py install)
 
 # Install milliluk-tools
 WORKDIR /root
 RUN git config --global core.autocrlf input && \
   git clone https://github.com/milliluk/milliluk-tools.git && \
   (cd milliluk-tools && git checkout 454e7247c892f7153136b9e5e6b12aeeecc9dd36 && \
   dos2unix < cgp220/cgp220.py > /usr/local/bin/cgp220.py && \
-  dos2unix < max2png/max2png.py > /usr/local/bin/max2png.py) && \
-  chmod a+x /usr/local/bin/cgp220.py /usr/local/bin/max2png.py 
+  chmod a+x /usr/local/bin/cgp220.py)
 
 # Install boisy/cmoc_os9
 RUN git clone https://github.com/tlindner/cmoc_os9.git
 WORKDIR cmoc_os9/lib
-RUN git checkout f843083a3c260d51d8ca118eca0565a50530a36f && \
+RUN git checkout 9f9dfda1406d152f137131f0670c94d105b9b072 && \
   make
 WORKDIR ../cgfx
 RUN make
@@ -74,12 +76,15 @@ WORKDIR ..
 RUN git clone https://github.com/mikeakohn/naken_asm.git && \
   git clone https://github.com/mikeakohn/java_grinder
 WORKDIR naken_asm
-RUN git checkout 79d8eb05b77f23f4225282f635c9ee8ec9398ca6 && \
+RUN git checkout 201acd7885bd6e31d5ca7001d6aa643b911913f3 && \
   ./configure && make && make install
 WORKDIR ../java_grinder
-RUN git checkout 7d5e279c8b52c99414ded785b0ef8065dead55eb && \
+RUN git checkout ae67d7c11bc94059b1d15c6b18eca06975ec92c0 && \
   make && cp java_grinder /usr/local/bin/
 WORKDIR ..
 
 # Clean up
 RUN apt-get clean
+
+# Convenience for Mac users
+RUN ln -s /home /Users

README.md

@@ -4,14 +4,14 @@ Color Computer](https://en.wikipedia.org/wiki/TRS-80_Color_Computer)
 applications. It implements a Docker image that includes the following tools:
 * [LWTOOLS 4.15](http://lwtools.projects.l-w.ca)
 * [ToolShed 2.2](https://sourceforge.net/p/toolshed/wiki/Home/)
-* [CMOC 0.1.52](http://perso.b2b2c.ca/~sarrazip/dev/cmoc.html)
+* [CMOC 0.1.53](http://perso.b2b2c.ca/~sarrazip/dev/cmoc.html)
 * [gcc6809](https://launchpad.net/~tormodvolden/+archive/ubuntu/m6809)
 * [MAME Tools](https://packages.ubuntu.com/xenial/utils/mame-tools)
 * [milliluk-tools](https://github.com/milliluk/milliluk-tools)
 * [tlinder/cmoc\_os9](https://github.com/tlinder/cmoc_os9)
 * [Java Grinder](http://www.mikekohn.net/micro/java_grinder.php)
 * [naken](http://www.mikekohn.net/micro/naken_asm.php)
-* Image conversion scripts by Mathieu Bouchard
+* [coco-tools 0.2](https://github.com/jamieleecho/coco-tools)
 * Python and Ruby as well as some useful Python packages
 
 

build

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 docker-compose -f docker-compose.build.yml build
-docker tag coco-dev_coco-dev:latest jamieleecho/coco-dev:0.9
+docker tag coco-dev_coco-dev:latest jamieleecho/coco-dev:0.10
 

coco-dev

@@ -1,13 +1,20 @@
- #!/usr/bin/env sh
+#!/usr/bin/env sh
+
+
+if [[ $* = *[!\ ]* ]]; then
+  params=( -c "$*" )
+else
+  params=()
+fi
 
 case "$(uname -s)" in
 
    Darwin)
-     docker-compose -f docker-compose.yml run --rm -w /home/$USER coco-dev bash
+     docker-compose -f docker-compose.yml run --rm -w `pwd | sed -e s#^/[Uu][Ss][Ee][Rr][Ss]#/home#` coco-dev bash "${params[@]}"
      ;;
 
    Linux)
-     docker-compose -f docker-compose.yml run --rm -w /home/$USER coco-dev bash
+     docker-compose -f docker-compose.yml run --rm -w `pwd | sed -e s#^/[Uu][Ss][Ee][Rr][Ss]#/home#` coco-dev bash "${params[@]}"
      ;;
 
    CYGWIN*|MINGW32*|MSYS*)

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   coco-dev:
-    image: jamieleecho/coco-dev:0.9
+    image: jamieleecho/coco-dev:0.10
     environment:
       - HOME=/home/$USER
     volumes: