diff --git a/client-py3/full/linux/Makefile b/client-py3/full/linux/Makefile index 796a679f..323d2350 100644 --- a/client-py3/full/linux/Makefile +++ b/client-py3/full/linux/Makefile @@ -40,7 +40,7 @@ install: ifeq ($(DISTRO),targz) cp installer.sh $(DESTDIR)/install.sh - tar czvf ../udsclient-$(VERSION).tar.gz -C $(DESTDIR) . + tar czvf ../udsclient3-$(VERSION).tar.gz -C $(DESTDIR) . endif ifeq ($(DISTRO),rh) diff --git a/server/src/uds/osmanagers/LinuxOsManager/__init__.py b/server/src/uds/osmanagers/LinuxOsManager/__init__.py index 40c898ab..1c8fdaf4 100644 --- a/server/src/uds/osmanagers/LinuxOsManager/__init__.py +++ b/server/src/uds/osmanagers/LinuxOsManager/__init__.py @@ -53,16 +53,16 @@ downloadsManager().registerDownloadable( downloadsManager().registerDownloadable( 'udsactor-{version}-1.noarch.rpm'.format(version=VERSION), - _('UDS Actor for Centos, Fedora, RH, ... Linux machines (Requires python 2.7)'), + _('UDS Actor for Centos, Fedora, RH, Suse, ... Linux machines (Requires python >= 3.6)'), os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-{version}-1.noarch.rpm'.format(version=VERSION), 'application/x-redhat-package-manager' ) downloadsManager().registerDownloadable( - 'udsactor-opensuse-{version}-1.noarch.rpm'.format(version=VERSION), - _('UDS Actor for openSUSE, ... Linux machines (Requires python 2.7)'), - os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-opensuse-{version}-1.noarch.rpm'.format(version=VERSION), - 'application/x-redhat-package-manager' + 'udsactor-unmanaged_{version}_all.deb'.format(version=VERSION), + _('UDS Actor for Debian based Linux machines. Used ONLY for static machines. (Requires python >= 3.6)'), + os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-unmanaged_{version}_all.deb'.format(version=VERSION), + 'application/x-debian-package' ) downloadsManager().registerDownloadable( @@ -73,8 +73,15 @@ downloadsManager().registerDownloadable( ) downloadsManager().registerDownloadable( - 'udsactor-unmanaged_{version}_all.deb'.format(version=VERSION), - _('UDS Actor for Debian based Linux machines. Used ONLY for static machines. (Requires python >= 3.6)'), - os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-unmanaged_{version}_all.deb'.format(version=VERSION), - 'application/x-debian-package' + 'udsactor-legacy-2.2.1-1.noarch.rpm', + _('Legacy UDS Actor for Centos, Fedora, RH, ... Linux machines (Requires python 2.7)'), + os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-legacy-2.2.1-1.noarch.rpm', + 'application/x-redhat-package-manager' +) + +downloadsManager().registerDownloadable( + 'udsactor-opensuse-legacy-2.2.1-1.noarch.rpm', + _('Legacy UDS Actor for OpenSUSE, ... Linux machines (Requires python 2.7)'), + os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-opensuse-legacy-2.2.1-1.noarch.rpm', + 'application/x-redhat-package-manager' ) diff --git a/server/src/uds/web/util/configjs.py b/server/src/uds/web/util/configjs.py index a0fc0764..55f91294 100644 --- a/server/src/uds/web/util/configjs.py +++ b/server/src/uds/web/util/configjs.py @@ -164,9 +164,8 @@ def udsJs(request: 'HttpRequest') -> str: ('UDSClient-{version}.pkg', gettext('Mac OS X client'), 'MacOS'), ('udsclient3_{version}_all.deb', gettext('Debian based Linux client') + ' ' + gettext('(requires Python-3.6 or newer)'), 'Linux'), ('udsclient_{version}_all.deb', gettext('Debian based Python 2.7 Linux client (legacy)') + ' ' + gettext('(requires Python-2.7)'), 'Linux'), - ('udsclient-{version}-1.noarch.rpm', gettext('Red Hat based Linux client (RH, Fedora, Centos, ...)') + ' ' + gettext('(requires Python-2.7)'), 'Linux'), - ('udsclient-opensuse-{version}-1.noarch.rpm', gettext('Suse based Linux client') + ' ' + gettext('(requires Python-2.7)'), 'Linux'), - ('udsclient-{version}.tar.gz', gettext('Generic .tar.gz Linux client') + ' ' + gettext('(requires Python-2.7)'), 'Linux') + ('udsclient3-{version}-1.noarch.rpm', gettext('RPM based Linux client (Fedora, Centos, Suse, ...)') + ' ' + gettext('(requires Python-3.6 or newer)'), 'Linux'), + ('udsclient-{version}.tar.gz', gettext('Generic .tar.gz Linux client') + ' ' + gettext('(requires Python-3.6 or newer'), 'Linux') ) ]