From 6f3184fc43ffb0bb66b8faa673b62f14b02ab859 Mon Sep 17 00:00:00 2001 From: "Ramón M. Gómez" Date: Thu, 5 Mar 2020 13:52:22 +0100 Subject: #940: Update Ubuntu and Windows OGAgent dependencies. --- admin/Sources/Clients/ogagent/linux/debian/control | 2 +- .../Sources/Clients/ogagent/windows/py2exe-wine-linux.sh | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/admin/Sources/Clients/ogagent/linux/debian/control b/admin/Sources/Clients/ogagent/linux/debian/control index 41c95e51..7df4deae 100644 --- a/admin/Sources/Clients/ogagent/linux/debian/control +++ b/admin/Sources/Clients/ogagent/linux/debian/control @@ -11,7 +11,7 @@ Section: admin Priority: optional Architecture: all Depends: - policykit-1 (>= 0.100), python (>= 2.7), python-qt4 (>= 4.9), python-requests (>= 0.8.2), + policykit-1 (>= 0.100), python2 (>=2.7) | python (>= 2.7), python-qt4 (>= 4.9),, python-requests (>= 0.8.2), python-six (>= 1.1), python-prctl (>= 1.1.1), python-distro, libxss1, ${misc:Depends} Suggests: gnome-shell-extension-top-icons-plus Description: OpenGnsys Agent for Operating Systems diff --git a/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh b/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh index 407dd155..68229b0b 100755 --- a/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh +++ b/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh @@ -11,12 +11,11 @@ download() { mkdir downloads # Get needed software cd downloads - wget -nd https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi -O python-2.7.msi - wget -nd http://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi + wget -nd https://www.python.org/ftp/python/2.7.17/python-2.7.17.msi -O python-2.7.msi + wget -nd https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi wget -nd https://bootstrap.pypa.io/get-pip.py - wget -nd http://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe/download -O py2exe-install.exe - wget -nd http://prdownloads.sourceforge.net/nsis/nsis-3.0rc1-setup.exe?download -O nsis-install.exe - wget -nd http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.4/PyQt4-4.11.4-gpl-Py2.7-Qt4.8.7-x32.exe/download -O pyqt-install.exe + wget -nd https://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.4/PyQt4-4.11.4-gpl-Py2.7-Qt4.8.7-x32.exe/download -O pyqt-install.exe + wget -nd https://prdownloads.sourceforge.net/nsis/nsis-3.05-setup.exe?download -O nsis-install.exe wget -nd http://nsis.sourceforge.net/mediawiki/images/d/d7/NSIS_Simple_Firewall_Plugin_1.20.zip cd .. } @@ -33,8 +32,6 @@ install_python() { echo "Installing vc for python" $WINE msiexec /qn /i VCForPython27.msi - echo "Installing py2exe (needs X)" - $WINE py2exe-install.exe echo "Installing pyqt (needs X)" $WINE pyqt-install.exe echo "Installing nsis (needs X?)" @@ -51,9 +48,10 @@ setup_pip() { install_packages() { echo "Installing pywin32" $WINE C:\\Python27\\python -m pip install pywin32 + echo "Installing py2exe" + $WINE C:\\Python27\\python -m pip install py2exe_py2 echo "Installing required packages" - $WINE C:\\Python27\\python -m pip install requests - $WINE C:\\Python27\\python -m pip install six + $WINE C:\\Python27\\python -m pip install requests six # Using easy_install instead of pip to install pycrypto $WINE C:\\Python27\\Scripts\\easy_install http://www.voidspace.org.uk/python/pycrypto-2.6.1/pycrypto-2.6.1.win32-py2.7.exe # Copy nsis required NSIS_Simple_Firewall_Plugin_1 -- cgit v1.2.3-18-g5258