diff --git a/CHANGELOG.md b/CHANGELOG.md index 3004f12..e803128 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ * Skynet support * Synchronize UI major/minor version with `repertory` major/minor version * Added `Password` component +* Reduced number of Linux binaries to: + * CentOS 7 + * Debian 9 + * Debian 10 + * Debian 9 ARM64 + * Debian 10 ARM64 + * Solus ## 1.1.5 * \#38: Enhance new repertory release available notification diff --git a/public/detect_linux.sh b/public/detect_linux.sh index 095e9ea..f92f2a0 100644 --- a/public/detect_linux.sh +++ b/public/detect_linux.sh @@ -14,8 +14,8 @@ if [ -f /etc/centos-release ]; then DISTNAME=centos DISTVER=7 elif [ "$VERSION_ID" = "8" ]; then - DISTNAME=centos - DISTVER=8 + DISTNAME=debian + DISTVER=10 else resetDistVer fi @@ -24,8 +24,12 @@ elif [ -f /etc/fedora-release ]; then if [ "$VERSION_ID" != "31" ] && [ "$VERSION_ID" != "30" ] && [ "$VERSION_ID" != "29" ] && [ "$VERSION_ID" != "28" ]; then resetDistVer else - DISTNAME=fedora - DISTVER=$VERSION_ID + DISTNAME=debian + if [ "$VERSION_ID" = "28" ]; then + DISTVER=9 + else + DISTVER=10 + fi fi elif [ -f /etc/solus-release ]; then DISTNAME=solus @@ -35,16 +39,16 @@ elif [ -f /etc/lsb-release ]; then DISTVER=${DISTRIB_RELEASE} if [ "$DISTNAME" != "ubuntu" ]; then if [ "$DISTNAME" = "linuxmint" ]; then - if [ "$DISTVER" = "19" ] || [ "$DISTVER" = "19.1" ] || [ "$DISTVER" = "19.2" ]; then - DISTNAME=ubuntu - DISTVER=18.04 + if [ "$DISTVER" = "19" ] || [ "$DISTVER" = "19.1" ] || [ "$DISTVER" = "19.2" ] || [ "$DISTVER" = "19.3" ]; then + DISTNAME=debian + DISTVER=9 else resetDistVer fi elif [ "$DISTNAME" = "elementary" ]; then - if [ "$DISTVER" = "5.0" ]; then - DISTNAME=ubuntu - DISTVER=18.04 + if [ "$DISTVER" = "5.0" ] || [ "$DISTVER" = "5.1" ]; then + DISTNAME=debian + DISTVER=9 else resetDistVer fi @@ -53,6 +57,13 @@ elif [ -f /etc/lsb-release ]; then fi elif [ "$DISTVER" != "18.04" ] && [ "$DISTVER" != "18.10" ] && [ "$DISTVER" != "19.04" ] && [ "$DISTVER" != "19.10" ]; then resetDistVer + else + DISTNAME=debian + if [ "$DISTVER" = "18.04" ]; then + DISTVER=9 + else + DISTVER=10 + fi fi fi @@ -68,23 +79,24 @@ if [ "$DISTNAME" = "unknown" ]; then if [ -f /etc/os-release ]; then . /etc/os-release if [ "$ID" = "arch" ]; then - DISTNAME=arch + DISTNAME=debian + DISTVER=10 elif [ "$ID" = "antergos" ] || [ "$ID" = "manjaro" ]; then - DISTNAME=ubuntu - DISTVER=18.10 + DISTNAME=debian + DISTVER=9 elif [ "$ID" = "opensuse-leap" ]; then if [ "$VERSION_ID" = "15.0" ]; then - DISTNAME=opensuse - DISTVER=15 + DISTNAME=debian + DISTVER=9 elif [ "$VERSION_ID" = "15.1" ]; then - DISTNAME=opensuse - DISTVER=15.1 + DISTNAME=debian + DISTVER=9 else resetDistVer fi elif [ "$ID" = "opensuse-tumbleweed" ]; then - DISTNAME=tumbleweed - DISTVER= + DISTNAME=debian + DISTVER=10 else resetDistVer fi diff --git a/src/constants.js b/src/constants.js index 8aea6e3..e94c18d 100644 --- a/src/constants.js +++ b/src/constants.js @@ -33,13 +33,12 @@ const REPERTORY_UI_BRANCH = '1.3.x_branch'; exports.RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory/raw/' + REPERTORY_BRANCH + '/releases_1.3.json'; exports.UI_RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory-ui/raw/' + REPERTORY_UI_BRANCH + '/releases.json'; -exports.LINUX_DETECT_SCRIPT_URL = 'https://bitbucket.org/blockstorage/repertory/raw/' + REPERTORY_BRANCH + '/detect_linux.sh'; +exports.LINUX_DETECT_SCRIPT_URL = 'https://bitbucket.org/blockstorage/repertory/raw/' + REPERTORY_BRANCH + '/detect_linux2.sh'; exports.LINUX_SELECTABLE_PLATFORMS = [ - 'ubuntu18.04', - 'ubuntu18.10', - 'ubuntu19.04', - 'ubuntu19.10' + 'centos7', + 'debian9', + 'debian10', ]; exports.DATA_LOCATIONS = {