Merge pull request #34 from ClickHouse/follow-up-33

Follow-up to #33

Author: rschu1ze

duckdb/install.sh

@@ -1 +1,4 @@
-sudo snap install duckdb
+#!/bin/bash
+
+rm -rf ~/.duckdb # remove remainders
+curl https://install.duckdb.org | sh

duckdb/main.sh

@@ -33,6 +33,7 @@ if [ "$CHOICE" = "ask" ]; then
 fi
 
 ./install.sh
+export PATH='/home/ubuntu/.duckdb/cli/latest':$PATH
 
 benchmark() {
     local size=$1
@@ -71,3 +72,6 @@ case $choice in
         benchmark 1
         ;;
 esac
+
+
+./uninstall.sh

duckdb/uninstall.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm -rf ~/.duckdb

elasticsearch/install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Install elasticsearch
-wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
+wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor --yes -o /usr/share/keyrings/elasticsearch-keyring.gpg
 sudo apt-get install apt-transport-https
 echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/8.x/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-8.x.list
 sudo apt-get update && sudo apt-get install elasticsearch

elasticsearch/main.sh

@@ -96,3 +96,5 @@ case $choice in
         benchmark 1 no_source_default_compression
         ;;
 esac
+
+./uninstall

elasticsearch/uninstall.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo apt-get remove --yes elasticsearch filebeat

mongodb/install.sh

@@ -4,10 +4,8 @@
 
 sudo sudo apt-get install gnupg curl
 curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | \
-   sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg \
-   --dearmor
+   sudo gpg --dearmor --yes -o /usr/share/keyrings/mongodb-server-8.0.gpg
 echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
 sudo apt-get update
 sudo apt-get install -y mongodb-org
 sudo systemctl start mongod
-sudo systemctl status mongod

mongodb/main.sh

@@ -82,3 +82,5 @@ case $choice in
         benchmark 1 zstd
         ;;
 esac
+
+./uninstall.sh

mongodb/uninstall.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo systemctl stop mongod
+sudo apt-get remove -y mongodb-org

postgresql/main.sh

@@ -54,8 +54,6 @@ benchmark() {
     ./drop_tables.sh "bluesky_${size}m_${compression}"
 }
 
-./uninstall
-
 case $choice in
     2)
         benchmark 10 lz4
@@ -84,3 +82,5 @@ case $choice in
         benchmark 1 pglz
         ;;
 esac
+
+./uninstall