From 42ed0f60b07cbc253184bd489923ebd0205a1f64 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 26 Aug 2025 08:06:00 +0200 Subject: [PATCH] Fix. --- .../desktop/home/plom/.local/bin/setup_apps | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/trixie/copy/desktop/home/plom/.local/bin/setup_apps b/trixie/copy/desktop/home/plom/.local/bin/setup_apps index 2f50ea2..a4cd1d2 100755 --- a/trixie/copy/desktop/home/plom/.local/bin/setup_apps +++ b/trixie/copy/desktop/home/plom/.local/bin/setup_apps @@ -3,8 +3,13 @@ set -e ROOT=$(dirname "$0") cd "${ROOT}" . lib/abort_if_offline.sh +. lib/abort_if_command_unknown.sh abort_if_offline +abort_if_command_unknown xz + +TEMP_DIR=$(mktemp -d) +cd "${TEMP_DIR}" install_with_repo() { local APP_NAME=$1 @@ -12,9 +17,6 @@ install_with_repo() { local KEY_FILENAME_SOURCE=${3} local SUITE=$4 - local TEMP_DIR - TEMP_DIR=$(mktemp -d) - local KEY_URL="${REPO_URL}/${KEY_FILENAME_SOURCE}" local KEY_FILENAME_TARGET="${APP_NAME}.gpg" local KEY_PATH="/usr/share/keyrings/${KEY_FILENAME_TARGET}" @@ -31,8 +33,6 @@ install_with_repo() { echo "Signed-by: ${KEY_PATH}" >> "${SOURCES_FILENAME}" sudo mv "${SOURCES_FILENAME}" "${SOURCES_PATH}" - rmdir "${TEMP_DIR}" - sudo apt update sudo apt install -y "${APP_NAME}-desktop" } @@ -41,5 +41,14 @@ install_with_repo mattermost deb.packages.mattermost.com pubkey.gpg stable install_with_repo signal updates.signal.org/desktop/apt keys.asc xenial -URL_TELEGRAM=https://telegram.org/dl/desktop/linux -wget "${URL_TELEGRAM}" +FILENAME_TGRAM_ARCHIVE=linux +URL_TGRAM_ARCHIVE="https://telegram.org/dl/desktop/${FILENAME_TGRAM_ARCHIVE}" +REL_PATH_TGRAM_DIR=Telegram +REL_PATH_TGRAM_APP="${REL_PATH_TGRAM_DIR}/Telegram" +wget "${URL_TGRAM_ARCHIVE}" +tar xf "${FILENAME_TGRAM_ARCHIVE}" +mv "${REL_PATH_TGRAM_APP}" "${ROOT}/" +rm -rf "${REL_PATH_TGRAM_DIR}" + +cd - +rmdir "${TEMP_DIR}" -- 2.30.2