r14-xdg-update: Enhance script location, replace bashishm, minor changes #136

Manually merged
selk merged 1 commits from feat/script-enhancement-r14-xdg-update into master 4 years ago
selk commented 4 years ago
Collaborator
There is no content yet.
SlavekB requested changes 4 years ago
SlavekB left a comment
Owner

Determining TDEDIR in this script may be easier – see comment.

Determining TDEDIR in this script may be easier – see comment.
r14-xdg-update Outdated
# Let's check if this script is called from the Debian alternatives
# See: https://wiki.debian.org/DebianAlternatives
if [ "$(readlink -- "$0")" = "/etc/alternatives/x-session-manager" ]
Owner

Value of $(readlink -- "$0") for r14-xdg-update script can never be /etc/alternatives/x-session-manager. So this part of the code is not applicable here.

Value of `$(readlink -- "$0")` for `r14-xdg-update` script can never be `/etc/alternatives/x-session-manager`. So this part of the code is not applicable here.
selk commented 4 years ago
Poster
Collaborator

@SlavekB Okay, good to know (I was in doubt). I've removed that code simplyfing the location with dirname.

@SlavekB Okay, good to know (I was in doubt). I've removed that code simplyfing the location with dirname.
selk closed this pull request 4 years ago
MicheleC deleted branch feat/script-enhancement-r14-xdg-update 4 years ago
Owner

Looks good now. Thanks Matias, both Slavek and I had the same doubt about that piece of code 😉

Looks good now. Thanks Matias, both Slavek and I had the same doubt about that piece of code :wink:
MicheleC added this to the R14.0.8 release milestone 4 years ago
selk commented 4 years ago
Poster
Collaborator

Hi @MicheleC :-)

Thanks for merge it, and thanks to SlavekB for review it. Now a question, the script "migratekde3" contains some same parts as the r14-xdg-update script, I should do the same for it?.

Hi @MicheleC :-) Thanks for merge it, and thanks to SlavekB for review it. Now a question, the script "migratekde3" contains some same parts as the r14-xdg-update script, I should do the same for it?.
Owner

Sounds like a good plan Matias. Again that script will not be called by a DM, so there is no need to check for debian alternatives.

Sounds like a good plan Matias. Again that script will not be called by a DM, so there is no need to check for debian alternatives.
The pull request has been manually merged as 09a76446bb.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tdebase#136
Loading…
There is no content yet.