DEB tdebase: Fix the default DM service package name detection for TDM.

This resolves an unwanted change from TDM to another installed DM
during the tdm-trinity package upgrade.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5bc997626b)
pull/92/head
Slávek Banko 4 years ago
parent f229967711
commit 6fc61c67bf
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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

@ -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

@ -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

Loading…
Cancel
Save