From 455e2e04ea646871539b2957660e98e632eab54d Mon Sep 17 00:00:00 2001 From: tom Date: Fri, 19 Oct 2018 12:48:12 -0500 Subject: [PATCH 1/4] Looks for the newest version rather than a fixed one as they delete the old version when a new one comes out --- build_makemkv/Dockerfile | 29 ++++++++++++++++----------- build_makemkv/pinger.sh | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 11 deletions(-) create mode 100755 build_makemkv/pinger.sh diff --git a/build_makemkv/Dockerfile b/build_makemkv/Dockerfile index be90918..24a6fe4 100644 --- a/build_makemkv/Dockerfile +++ b/build_makemkv/Dockerfile @@ -1,22 +1,29 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y python-virtualenv build-essential pkg-config libc6-dev libssl-dev libexpat1-dev libavcodec-dev libgl1-mesa-dev +RUN apt-get update && apt-get install -y python-virtualenv build-essential pkg-config libc6-dev libssl-dev libexpat1-dev libavcodec-dev libgl1-mesa-dev curl wget -ADD http://www.makemkv.com/download/makemkv-oss-1.10.2.tar.gz /src/ -ADD http://www.makemkv.com/download/makemkv-bin-1.10.2.tar.gz /src/ +ADD pinger.sh /src/ +RUN chmod +x /src/pinger.sh +RUN /src/pinger.sh -RUN tar xf /src/makemkv-bin-1.10.2.tar.gz -C /src +RUN tar xf /src/makemkv-bin.tar.gz -C /src +RUN mkdir /src/makemkv-bin/ +RUN mv /src/makemkv-bin-*/* /src/makemkv-bin/ +RUN ls /src/ -RUN mkdir /src/makemkv-bin-1.10.2/tmp/ -RUN echo 'accepted' > /src/makemkv-bin-1.10.2/tmp/eula_accepted +RUN mkdir /src/makemkv-bin/tmp/ +RUN echo 'accepted' > /src/makemkv-bin/tmp/eula_accepted +RUN ls /src/makemkv-bin/ -RUN sed -ie 's#DESTDIR=#DESTDIR=/build#g' /src/makemkv-bin-1.10.2/Makefile +RUN sed -ie 's#DESTDIR=#DESTDIR=/build#g' /src/makemkv-bin/Makefile -RUN cd /src/makemkv-bin-1.10.2 && make install +RUN cd /src/makemkv-bin && make install -RUN tar xf /src/makemkv-oss-1.10.2.tar.gz -C /src +RUN tar xf /src/makemkv-oss.tar.gz -C /src +RUN mkdir /src/makemkv-oss/ +RUN mv /src/makemkv-oss-*/* /src/makemkv-oss/ -RUN cd /src/makemkv-oss-1.10.2 && ./configure --prefix /build/usr --disable-gui && make install +RUN cd /src/makemkv-oss && ./configure --prefix /build/usr --disable-gui && make install -CMD ["tar", "cz", "/build"] \ No newline at end of file +CMD ["tar", "cz", "/build"] diff --git a/build_makemkv/pinger.sh b/build_makemkv/pinger.sh new file mode 100755 index 0000000..3e21295 --- /dev/null +++ b/build_makemkv/pinger.sh @@ -0,0 +1,42 @@ +#!/bin/bash +version="" +keepRunning=true +echo "-> Finding newest makemkv version..." +while : +do + for f in $(seq 1 10) + do + for s in $(seq 12 100) + do + for t in $(seq 1 10) + do + #echo "$f.$s.$t" + if [ $keepRunning == true ] + then + curl -s --head http://www.makemkv.com/download/makemkv-oss-$f.$s.$t.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null + else + break + fi + if [ $? == 0 ] + then + version="$f.$s.$t" + keepRunning=false + break + fi + done + done + done + curl -s --head http://www.makemkv.com/download/makemkv-oss-$version.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null + if [ $? == 0 ] + then + break + elif [ $? == 1 ] + then + echo "One" + fi +done +echo "Version: $version" +wget http://www.makemkv.com/download/makemkv-oss-$version.tar.gz +mv makemkv-oss-$version.tar.gz /src/makemkv-oss.tar.gz +wget http://www.makemkv.com/download/makemkv-bin-$version.tar.gz +mv makemkv-bin-$version.tar.gz /src/makemkv-bin.tar.gz From a0afa8d67b7f8ca9e76fefc9e1b1c637a6ff9506 Mon Sep 17 00:00:00 2001 From: tom Date: Fri, 19 Oct 2018 16:14:27 -0500 Subject: [PATCH 2/4] Cleaned out debug code and added comments --- build_makemkv/Dockerfile | 2 -- build_makemkv/pinger.sh | 16 ++++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build_makemkv/Dockerfile b/build_makemkv/Dockerfile index 24a6fe4..5e3ec2d 100644 --- a/build_makemkv/Dockerfile +++ b/build_makemkv/Dockerfile @@ -10,8 +10,6 @@ RUN tar xf /src/makemkv-bin.tar.gz -C /src RUN mkdir /src/makemkv-bin/ RUN mv /src/makemkv-bin-*/* /src/makemkv-bin/ -RUN ls /src/ - RUN mkdir /src/makemkv-bin/tmp/ RUN echo 'accepted' > /src/makemkv-bin/tmp/eula_accepted RUN ls /src/makemkv-bin/ diff --git a/build_makemkv/pinger.sh b/build_makemkv/pinger.sh index 3e21295..7758816 100755 --- a/build_makemkv/pinger.sh +++ b/build_makemkv/pinger.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Loops through different url combos to find newest makemkv version version="" keepRunning=true echo "-> Finding newest makemkv version..." @@ -6,13 +7,14 @@ while : do for f in $(seq 1 10) do - for s in $(seq 12 100) + for s in $(seq 12 100) # Starts at 12 bc that was the newest version do for t in $(seq 1 10) do - #echo "$f.$s.$t" + #echo "$f.$s.$t" # Prints every version that's checked if [ $keepRunning == true ] then + # Checks to see if url exists curl -s --head http://www.makemkv.com/download/makemkv-oss-$f.$s.$t.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null else break @@ -26,16 +28,10 @@ do done done done - curl -s --head http://www.makemkv.com/download/makemkv-oss-$version.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null - if [ $? == 0 ] - then - break - elif [ $? == 1 ] - then - echo "One" - fi done echo "Version: $version" + +# Downloads tar files and removes version number from file name wget http://www.makemkv.com/download/makemkv-oss-$version.tar.gz mv makemkv-oss-$version.tar.gz /src/makemkv-oss.tar.gz wget http://www.makemkv.com/download/makemkv-bin-$version.tar.gz From 1efedd9215dbd4f64face774728c792a7de938ca Mon Sep 17 00:00:00 2001 From: tmcdonagh Date: Fri, 19 Oct 2018 16:30:17 -0500 Subject: [PATCH 3/4] Fixed accidental deletion --- build_makemkv/pinger.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build_makemkv/pinger.sh b/build_makemkv/pinger.sh index 7758816..45df08d 100755 --- a/build_makemkv/pinger.sh +++ b/build_makemkv/pinger.sh @@ -11,7 +11,7 @@ do do for t in $(seq 1 10) do - #echo "$f.$s.$t" # Prints every version that's checked + echo "$f.$s.$t" # Prints every version that's checked if [ $keepRunning == true ] then # Checks to see if url exists @@ -28,6 +28,14 @@ do done done done + curl -s --head http://www.makemkv.com/download/makemkv-oss-$version.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null + if [ $? == 0 ] + then + break + elif [ $? == 1 ] + then + echo "One" + fi done echo "Version: $version" From 0e117dcef992661ed39a798ca9875186f9cc6ff4 Mon Sep 17 00:00:00 2001 From: tmcdonagh Date: Fri, 19 Oct 2018 16:31:36 -0500 Subject: [PATCH 4/4] Removed debug command --- build_makemkv/pinger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_makemkv/pinger.sh b/build_makemkv/pinger.sh index 45df08d..43760e6 100755 --- a/build_makemkv/pinger.sh +++ b/build_makemkv/pinger.sh @@ -11,7 +11,7 @@ do do for t in $(seq 1 10) do - echo "$f.$s.$t" # Prints every version that's checked + #echo "$f.$s.$t" # Prints every version that's checked if [ $keepRunning == true ] then # Checks to see if url exists