From 5c41b022a46f4915e8a0b623a26d41a11a6f7fb9 Mon Sep 17 00:00:00 2001
From: drvarun <12458730+drvarun@users.noreply.github.com>
Date: Wed, 7 Jul 2021 17:35:21 +0200
Subject: [PATCH 1/2] Use TPM2-TSS Release 3.1 and Minor Fixes

Removed Docker Double Installation (line 75 to 85 were repeated)
Use TPM2-TSS Release 3.1
---
 scripts/install.sh | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index efbb5b994..28eb7dca8 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -84,19 +84,6 @@ sudo add-apt-repository \
 sudo apt-get update
 sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
-echo "Install docker"
-
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-
-sudo add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-
-sudo apt-get update
-sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-
-
 echo "Install ScyllaDB"
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 5e08fbd8b5d6ec9c
@@ -142,9 +129,10 @@ sudo apt -y install \
   libcurl4-openssl-dev \
   acl
 
-git clone https://github.com/tpm2-software/tpm2-tss.git $INSTALL_DIR/tpm2-tss
-cd $INSTALL_DIR/tpm2-tss
-./bootstrap
+cd $INSTALL_DIR
+wget https://github.com/tpm2-software/tpm2-tss/releases/download/3.1.0/tpm2-tss-3.1.0.tar.gz
+tar -xf tpm2-tss-3.1.0.tar.gz && rm tpm2-tss-3.1.0.tar.gz
+mv tpm2-tss-3.1.0 tpm2-tss && cd tpm2-tss
 ./configure --with-udevrulesdir=/etc/udev/rules.d
 make -j$(nproc)
 

From f9e0e27267a155454464bd264585955bc8481a16 Mon Sep 17 00:00:00 2001
From: drvarun <12458730+drvarun@users.noreply.github.com>
Date: Wed, 7 Jul 2021 17:51:56 +0200
Subject: [PATCH 2/2] fixed folder name

---
 scripts/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 28eb7dca8..e7c5bcece 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -131,8 +131,8 @@ sudo apt -y install \
 
 cd $INSTALL_DIR
 wget https://github.com/tpm2-software/tpm2-tss/releases/download/3.1.0/tpm2-tss-3.1.0.tar.gz
-tar -xf tpm2-tss-3.1.0.tar.gz && rm tpm2-tss-3.1.0.tar.gz
-mv tpm2-tss-3.1.0 tpm2-tss && cd tpm2-tss
+tar -xf tpm2-tss-3.1.0.tar.gz --one-top-level=tpm2-tss --strip-components 1
+rm tpm2-tss-3.1.0.tar.gz && cd tpm2-tss
 ./configure --with-udevrulesdir=/etc/udev/rules.d
 make -j$(nproc)