Unverified Commit 10647c85 by devttys0 Committed by GitHub

Merge pull request #306 from mongo-1e020f1407/deps_change_for_ubuntu17

1.deps.sh now checks distro version number and displays it
parents c5d8a02d c3e006ac
...@@ -25,6 +25,7 @@ fi ...@@ -25,6 +25,7 @@ fi
if [ $YES -eq 0 ] if [ $YES -eq 0 ]
then then
distro="${1:-$(lsb_release -i|cut -f 2)}" distro="${1:-$(lsb_release -i|cut -f 2)}"
distro_version="${1:-$(lsb_release -r|cut -f 2|cut -c1-2)}"
else else
distro="${2:-$(lsb_release -i|cut -f 2)}" distro="${2:-$(lsb_release -i|cut -f 2)}"
fi fi
...@@ -35,6 +36,9 @@ YUMCMD="yum" ...@@ -35,6 +36,9 @@ YUMCMD="yum"
if [ $distro = "Kali" ] if [ $distro = "Kali" ]
then then
APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract util-linux firmware-mod-kit cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop cpio" APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract util-linux firmware-mod-kit cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop cpio"
elif [ $distro_version = "17" ]
then
APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop srecord cpio"
else else
APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract cramfsprogs cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop srecord cpio" APT_CANDIDATES="git build-essential libqt4-opengl mtd-utils gzip bzip2 tar arj lhasa p7zip p7zip-full cabextract cramfsprogs cramfsswap squashfs-tools zlib1g-dev liblzma-dev liblzo2-dev sleuthkit default-jdk lzop srecord cpio"
fi fi
...@@ -136,7 +140,7 @@ then ...@@ -136,7 +140,7 @@ then
echo "" echo ""
if [ $distro != Unknown ] if [ $distro != Unknown ]
then then
echo " $distro detected" echo " $distro $distro_version detected"
else else
echo "WARNING: Distro not detected, using package-manager defaults" echo "WARNING: Distro not detected, using package-manager defaults"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment