Fixed the actual OS being output for Cygwin. This might be it.

This commit is contained in:
Brett Bohnenkamper
2013-05-22 00:50:46 -05:00
parent dc5359e015
commit aebd80bced

View File

@@ -2718,8 +2718,9 @@ infoDisplay () {
else mydistro=$(echo -e "$labelcolor OS:$textcolor $sysArch $distro $prodVers $buildVers"); fi
elif [[ "$distro" == "Cygwin" ]]; then
distro=$(wmic os get name | head -2 | tail -1)
distro=$(expr match "$os" '\(Microsoft Windows [A-Za-z0-9]\+\)')
sysArch=arch=$(wmic os get OSArchitecture | head -2 | tail -1 | tr -d '\r ')
distro=$(expr match "$distro" '\(Microsoft Windows [A-Za-z0-9]\+\)')
sysArch=$(wmic os get OSArchitecture | head -2 | tail -1 | tr -d '\r ')
mydistro=$(echo -e "$labelcolor OS:$textcolor $distro $sysArch")
else
if [ -n "$distro_more" ]; then mydistro=$(echo -e "$labelcolor OS:$textcolor $distro_more")
else mydistro=$(echo -e "$labelcolor OS:$textcolor $distro $sysArch"); fi