From 5bc997626bedf1356339a2bbc515a9bda456afef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 17 Jan 2021 20:16:20 +0100 Subject: DEB tdebase: Fix the default DM service package name detection for TDM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This resolves an unwanted change from TDM to another installed DM during the tdm-trinity package upgrade. Signed-off-by: Slávek Banko --- debian/_base/core/tdebase/debian/tdm-trinity.config | 9 +++++---- dilos/core/tdebase/debian/tdm-trinity.config | 9 +++++---- ubuntu/_base/core/tdebase/debian/tdm-trinity.config | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.config b/debian/_base/core/tdebase/debian/tdm-trinity.config index 1d73249f7..8e5c207d7 100644 --- a/debian/_base/core/tdebase/debian/tdm-trinity.config +++ b/debian/_base/core/tdebase/debian/tdm-trinity.config @@ -38,10 +38,11 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for tdm and tdm-kde4 share the same basename - # so we need to check if it's tdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then - CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 + # the debconf configuration stores the package name, + # while the configuration files point to the binary name + # therefore tdm-trinity package name must be used for the tdm binary + if [ "$CURRENT_DEFAULT" = "/opt/trinity/bin/tdm" ]; then + CURRENT_DEFAULT=${THIS_PACKAGE} else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) fi diff --git a/dilos/core/tdebase/debian/tdm-trinity.config b/dilos/core/tdebase/debian/tdm-trinity.config index 1d73249f7..3454c39fe 100644 --- a/dilos/core/tdebase/debian/tdm-trinity.config +++ b/dilos/core/tdebase/debian/tdm-trinity.config @@ -38,10 +38,11 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for tdm and tdm-kde4 share the same basename - # so we need to check if it's tdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then - CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 + # the debconf configuration stores the package name, + # while the configuration files point to the binary name + # therefore tdm-trinity package name must be used for the tdm binary + if [ "$CURRENT_DEFAULT" = "/usr/bin/tdm" ]; then + CURRENT_DEFAULT=${THIS_PACKAGE} else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) fi diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config index 1d73249f7..26fc8427c 100644 --- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config +++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config @@ -38,10 +38,11 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for tdm and tdm-kde4 share the same basename - # so we need to check if it's tdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then - CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 + # the debconf configuration stores the package name, + # while the configuration files point to the binary name + # tdm-trinity package name must be used for the tdm binary + if [ "$CURRENT_DEFAULT" = "/opt/trinity/bin/tdm" ]; then + CURRENT_DEFAULT=${THIS_PACKAGE} else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) fi -- cgit v1.2.1