From 3af012954a8d105ceaac58ef4684e06e889c9844 Mon Sep 17 00:00:00 2001 From: gmpinder Date: Sun, 4 Jun 2023 23:24:32 -0400 Subject: [PATCH] Install docker; remove synergy --- recipe.yml | 1 + scripts/post/install-synergy.sh | 40 -------------------------------- scripts/pre/install-syncthing.sh | 4 ++-- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 scripts/post/install-synergy.sh diff --git a/recipe.yml b/recipe.yml index 799c51b..b5c2049 100644 --- a/recipe.yml +++ b/recipe.yml @@ -61,6 +61,7 @@ rpm: # - tilix - code - cronie + - docker # These RPMs will be removed from the system image. This step happens during # image build, BEFORE installing custom RPMs (from the "rpm.install" category). remove: diff --git a/scripts/post/install-synergy.sh b/scripts/post/install-synergy.sh deleted file mode 100644 index 05d79a1..0000000 --- a/scripts/post/install-synergy.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -# Fail on any error -set -eou pipefail - -# Define version -version="v3.0.72.1-rc1" - -# Define base name for the file -base_name="synergy-linux_x64-libssl3" - -# Define file URL -url="https://rc.symless.com/synergy3/${version}/${base_name}-${version}.rpm" - -# Define file name -file="/tmp/${base_name}-${version}.rpm" - -# Directory that we need to remove before installation -dir="/opt/Synergy" - -# Download file -echo "Downloading file..." -wget -qO "$file" "$url" - -# Check if directory exists -if [ -d "$dir" ] -then - echo "Removing existing directory..." - rm -rf "$dir" -fi - -# Install the package using rpm -echo "Installing package..." -rpm -i "$file" - -# Remove the downloaded file -echo "Removing the downloaded file..." -rm "$file" - -echo "Done." diff --git a/scripts/pre/install-syncthing.sh b/scripts/pre/install-syncthing.sh index 0883f52..57b4777 100644 --- a/scripts/pre/install-syncthing.sh +++ b/scripts/pre/install-syncthing.sh @@ -7,10 +7,10 @@ FILENAME="syncthing-linux-amd64-${VERSION}.tar.gz" EXTRACTED_DIR="syncthing-linux-amd64-${VERSION}" # Download the file -wget "${BASE_URL}/${VERSION}/${FILENAME}" +wget --quiet "${BASE_URL}/${VERSION}/${FILENAME}" # Extract the file -tar xvf "${FILENAME}" +tar xf "${FILENAME}" # Move the binary to /usr/local/bin mv "${EXTRACTED_DIR}/syncthing" /usr/bin