commit 64cc8a1c1ee26aff2e51c6126e75d870c5e89bc7 Author: Enrico Forestieri <for...@lyx.org> Date: Sun Aug 3 18:59:54 2014 +0200
Use getent instead of grepping /etc/passwd. Forthcoming versions of cygwin will use a different mechanism for obtaining passwd/group information based on /etc/nsswitch.conf. Thus, it will not be guaranteed that the files /etc/passwd and /etc/group even exist. The recommended way for obtaining those info is by using the getent command, which already works in current versions. diff --git a/development/cygwin/lyxprofile b/development/cygwin/lyxprofile index f51bd55..afa21be 100644 --- a/development/cygwin/lyxprofile +++ b/development/cygwin/lyxprofile @@ -1,7 +1,7 @@ # Set up the home directory if not already set in the system environment. if [ -z "${HOME}" ]; then USER=`id -un` - HOME=`grep "^${USER}:" /etc/passwd | cut -d: -f6` + HOME=`getent passwd "${USER}" | cut -d: -f6` if [ -z "${HOME}" -o ! -d "${HOME}" ]; then HOME="/home/${USER}" test -d "${HOME}" || HOME=/tmp diff --git a/status.21x b/status.21x index 4528411..716e014 100644 --- a/status.21x +++ b/status.21x @@ -46,6 +46,9 @@ What's new - Fix compatibility issue with 64-bit cygwin. +- On Cygwin, use getent instead of grepping /etc/passwd for determining + the user's home directory when launching LyX through the gui wrapper. + ** Bug fixes: