From 048b0b33a8e1a4877e77f0e43b3ec290f985225a Mon Sep 17 00:00:00 2001
From: Joon-Klaps <joonklaps@gmail.com>
Date: Thu, 18 Jul 2024 16:14:34 +0800
Subject: [PATCH 1/5] beastX-beta3

---
 Dockerfile       |  3 ++-
 install-beast.sh | 15 +++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b7446ed..847e05f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,8 @@ FROM nvidia/cuda:11.0.3-devel-ubuntu20.04
 # CUDA 7.5 (7.5.16)     >= 352.31
 # CUDA 7.0 (7.0.28)     >= 346.46
 
-LABEL maintainer "Daniel Park <dpark@broadinstitute.org>"
+LABEL maintainer "Joon Klaps <joon.klaps@kuleuven.be>"
+LABEL maintainer_other "Daniel Park <dpark@broadinstitute.org>"
 LABEL maintainer_other "Christopher Tomkins-Tinch <tomkinsc@broadinstitute.org>"
 
 COPY install-*.sh /opt/docker/
diff --git a/install-beast.sh b/install-beast.sh
index 68e10e2..c80f069 100755
--- a/install-beast.sh
+++ b/install-beast.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-beast_version="1.10.5pre_thorney_0.1.2"
-# uncomment when out of pre-release:
-#wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/v${beast_version}/BEASTv${beast_version}.tgz
-wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/v1.10.5pre_thorney_v0.1.2/BEASTv1.10.5pre_thorney_0.1.2.tgz -O BEASTv${beast_version}.tgz
+beast_version="BEAST_X_v10.5.0-beta3"
 
-tar -xzpf BEASTv${beast_version}.tgz
-rm BEASTv${beast_version}.tgz
+wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/v10.5.0-beta3/${beast_version}.tgz -O ${beast_version}.tgz
 
-mv BEASTv${beast_version}/bin/* /usr/local/bin
-mv BEASTv${beast_version}/lib/* /usr/local/lib
+tar -xzpf ${beast_version}.tgz && mv BEAST*/ ${beast_version}
+rm ${beast_version}.tgz
+
+mv ${beast_version}/bin/* /usr/local/bin
+mv ${beast_version}/lib/* /usr/local/lib
 
 beast -beagle_info

From b536bd6421d369cea7da03a8807f94e79f09b8f9 Mon Sep 17 00:00:00 2001
From: Joon-Klaps <joonklaps@gmail.com>
Date: Thu, 18 Jul 2024 16:19:28 +0800
Subject: [PATCH 2/5] fixing names & maintainers

---
 Dockerfile       |  4 ++--
 install-beast.sh | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 847e05f..91db842 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,10 +37,10 @@ FROM nvidia/cuda:11.0.3-devel-ubuntu20.04
 # CUDA 7.5 (7.5.16)     >= 352.31
 # CUDA 7.0 (7.0.28)     >= 346.46
 
-LABEL maintainer "Joon Klaps <joon.klaps@kuleuven.be>"
-LABEL maintainer_other "Daniel Park <dpark@broadinstitute.org>"
+LABEL maintainer "Daniel Park <dpark@broadinstitute.org>"
 LABEL maintainer_other "Christopher Tomkins-Tinch <tomkinsc@broadinstitute.org>"
 
+
 COPY install-*.sh /opt/docker/
 
 # System packages, Google Cloud SDK, and locale
diff --git a/install-beast.sh b/install-beast.sh
index c80f069..1082dc5 100755
--- a/install-beast.sh
+++ b/install-beast.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
-beast_version="BEAST_X_v10.5.0-beta3"
+beast_name="v10.5.0-beta3"
+beast_name="BEAST_X_${beast_name}"
 
-wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/v10.5.0-beta3/${beast_version}.tgz -O ${beast_version}.tgz
+wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/${beast_version}/${beast_name}.tgz -O ${beast_name}.tgz
 
-tar -xzpf ${beast_version}.tgz && mv BEAST*/ ${beast_version}
-rm ${beast_version}.tgz
+tar -xzpf ${beast_name}.tgz && mv BEAST*/ ${beast_name}
+rm ${beast_name}.tgz
 
-mv ${beast_version}/bin/* /usr/local/bin
-mv ${beast_version}/lib/* /usr/local/lib
+mv ${beast_name}/bin/* /usr/local/bin
+mv ${beast_name}/lib/* /usr/local/lib
 
 beast -beagle_info

From b3dd36005d43fbe4b6e345e795aeac7d258fc76b Mon Sep 17 00:00:00 2001
From: Joon-Klaps <joonklaps@gmail.com>
Date: Thu, 18 Jul 2024 16:20:37 +0800
Subject: [PATCH 3/5] rm empty line

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 91db842..b7446ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,6 @@ FROM nvidia/cuda:11.0.3-devel-ubuntu20.04
 LABEL maintainer "Daniel Park <dpark@broadinstitute.org>"
 LABEL maintainer_other "Christopher Tomkins-Tinch <tomkinsc@broadinstitute.org>"
 
-
 COPY install-*.sh /opt/docker/
 
 # System packages, Google Cloud SDK, and locale

From b451da46b78552ac072c1a9979139967d22eb99d Mon Sep 17 00:00:00 2001
From: Joon-Klaps <joonklaps@gmail.com>
Date: Thu, 18 Jul 2024 16:21:59 +0800
Subject: [PATCH 4/5] fix typo

---
 install-beast.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-beast.sh b/install-beast.sh
index 1082dc5..c35516d 100755
--- a/install-beast.sh
+++ b/install-beast.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 beast_name="v10.5.0-beta3"
-beast_name="BEAST_X_${beast_name}"
+beast_name="BEAST_X_${beast_version}"
 
 wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/${beast_version}/${beast_name}.tgz -O ${beast_name}.tgz
 

From 9028ec544f68a399796906e02905b57a7f693fd4 Mon Sep 17 00:00:00 2001
From: Joon-Klaps <joon.klaps@kuleuven.be>
Date: Fri, 19 Jul 2024 02:24:11 +0000
Subject: [PATCH 5/5] fix copy pasta mistake

---
 install-beast.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-beast.sh b/install-beast.sh
index c35516d..2f5be3c 100755
--- a/install-beast.sh
+++ b/install-beast.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-beast_name="v10.5.0-beta3"
+beast_version="v10.5.0-beta3"
 beast_name="BEAST_X_${beast_version}"
 
 wget --quiet https://github.com/beast-dev/beast-mcmc/releases/download/${beast_version}/${beast_name}.tgz -O ${beast_name}.tgz