Skip to content

Commit 30f4b82

Browse files
yogeshbirlaYogesh Birla
andauthored
Add sles15 support to install-powershell.sh (PowerShell#16984)
Co-authored-by: Yogesh Birla <yogeshbirla@microsoft.com>
1 parent ba6fbe9 commit 30f4b82

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

tools/install-powershell.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ install(){
9595
else
9696
DistroBasedOn='redhat'
9797
fi
98-
elif [ -f /etc/SuSE-release ] ; then
99-
DistroBasedOn='suse'
100-
PSUEDONAME=$( (tr "\n" ' '| sed s/VERSION.*//) < /etc/SuSE-release )
101-
REV=$( (grep 'VERSION' | sed s/.*=\ //) < /etc/SuSE-release )
10298
elif [ -f /etc/mandrake-release ] ; then
10399
DistroBasedOn='mandrake'
104100
PSUEDONAME=$( (sed s/.*\(// | sed s/\)//) < /etc/mandrake-release )
@@ -117,6 +113,11 @@ install(){
117113
if [ -f /etc/UnitedLinux-release ] ; then
118114
DIST="${DIST}[$( (tr "\n" ' ' | sed s/VERSION.*//) < /etc/UnitedLinux-release )]"
119115
fi
116+
osname=$(source /etc/os-release; echo $PRETTY_NAME)
117+
if [[ $osname = *SUSE* ]]; then
118+
DistroBasedOn='suse'
119+
REV=$(source /etc/os-release; echo $VERSION_ID)
120+
fi
120121
OS=$(lowercase $OS)
121122
DistroBasedOn=$(lowercase $DistroBasedOn)
122123
fi

tools/installpsh-suse.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ else
7171
else
7272
DistroBasedOn='redhat'
7373
fi
74-
elif [ -f /etc/SuSE-release ] ; then
75-
DistroBasedOn='suse'
7674
elif [ -f /etc/mandrake-release ] ; then
7775
DistroBasedOn='mandrake'
7876
elif [ -f /etc/debian_version ] ; then
@@ -82,6 +80,10 @@ else
8280
DIST="${DIST}[$( (tr "\n" ' ' | sed s/VERSION.*//) < /etc/UnitedLinux-release )]"
8381
DistroBasedOn=unitedlinux
8482
fi
83+
osname=$(source /etc/os-release; echo $PRETTY_NAME)
84+
if [[ $osname = *SUSE* ]]; then
85+
DistroBasedOn='suse'
86+
fi
8587
OS=$(lowercase "$OS")
8688
DistroBasedOn=$(lowercase "$DistroBasedOn")
8789
fi

0 commit comments

Comments
 (0)