From a3e5e96834b7051fe13e8d7c3f417465d9c90149 Mon Sep 17 00:00:00 2001
From: Dagen Brock <dagenbrock@gmail.com>
Date: Wed, 4 Mar 2020 10:26:03 -0600
Subject: [PATCH] 2

---
 Dockerfile    |  3 ++-
 entrypoint.sh | 16 ++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c5b5752..684c01a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,8 @@ RUN apt-get update
 
 # Install packages
 #RUN apt-get -yq install rsync openssh-client
-RUN apt-get -yq install unzip curl
+RUN apt-get -yq install unzip curl python3
+
 
 
 # Label
diff --git a/entrypoint.sh b/entrypoint.sh
index 4d6546d..a64b2d4 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -6,22 +6,14 @@ curl -L $CADZIP -o cadius.zip
 unzip -n cadius.zip
 mv cadius /usr/bin
 
-cadius createvolume $INPUT_VOLUME_PATH $INPUT_VOLUME_NAME $INPUT_VOLUME_SIZE
-
 if [ "$INPUT_INCLUDE_PRODOS" = "true" ]; then
-    apt-get install -y python3
     echo "Grabbing ProDOS 2.4.2"
     curl -k -L https://mirrors.apple2.org.za/ftp.apple.asimov.net/images/masters/prodos/ProDOS_2_4_2.dsk -o ProDOS_2_4_2.dsk
-    #git clone https://github.com/digarok/dsk2po.git
+    echo "Convert DSK to PO"
     curl -k -L https://raw.githubusercontent.com/digarok/dsk2po/master/dsk2po.py -o dsk2po.py
-    echo "WHICH"
-    which python
-    which python3
-    ls /usr/bin
-    echo "-----"
-    ls /bin
     /usr/bin/python3 dsk2po.py ProDOS_2_4_2.dsk
-    cadius extractfile ProDOS_2_4_2.po /PRODOS.2.4.2/PRODOS  .
-    cadius extractfile ProDOS_2_4_2.po /PRODOS.2.4.2/BASIC.SYSTEM  .
+    cadius extractvolume ProDOS_2_4_2.po .
+    echo "ProDOS 2.4.2 files available in ./PRODOS.2.4.2/ :"
+    ls ./PRODOS.2.4.2/
 fi
 ls