Merge branch 'master' into ogagent-oglive

linux/Makefile

@@ -17,6 +17,7 @@ CACHES := $(shell find $(SOURCEDIR) -name '__pycache__')
 
 clean:
 	rm -rf $(PYC) $(CACHES) $(DESTDIR)
+
 install-ogagent:
 	rm -rf $(DESTDIR)
 	mkdir -p $(LIBDIR)
@@ -26,8 +27,7 @@ install-ogagent:
 	mkdir -p $(CFGDIR)
 	mkdir -p $(XDGAUTOSTARTDIR)
 	mkdir -p $(KDEAUTOSTARTDIR)
-	
+	mkdir -p $(LIBDIR)/img
-	mkdir $(LIBDIR)/img
 
 	# Cleans up .pyc and cache folders
 	rm -f $(PYC) $(CACHES)
@@ -40,6 +40,8 @@ install-ogagent:
 	# QT Dialogs & resources
 	cp $(SOURCEDIR)/*_ui.py $(LIBDIR)
 	cp $(SOURCEDIR)/OGAgent_rc.py $(LIBDIR)
+	# Version file
+	cp $(SOURCEDIR)/VERSION $(LIBDIR)
 
 	# Autostart elements for gnome/kde
 	cp desktop/OGAgentTool.desktop $(XDGAUTOSTARTDIR)
@@ -65,7 +67,6 @@ ifeq ($(DISTRO),rh)
 	ln -fs /usr/share/OGAgent/cfg/ogclient.cfg $(CFGDIR)
 endif
 
-	# chmod 0755 $(BINDIR)/ogagent
 uninstall:
 	rm -rf $(LIBDIR)
 	# rm -f $(BINDIR)/ogagent

linux/debian/control

@@ -4,12 +4,13 @@ Priority: optional
 Maintainer: Ramón M. Gómez <ramongomez@us.es>
 Build-Depends: debhelper (>= 7), po-debconf
 Standards-Version: 3.9.2
-Homepage: https://opengnsys.es
+Homepage: https://opengnsys.es/
 
 Package: ogagent
 Section: admin
 Priority: optional
 Architecture: all
 Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, ${misc:Depends}
+Recommends: gnome-shell-extension-top-icons-plus
 Description: OpenGnsys Agent for Operating Systems
  This package provides the required components to allow this machine to work on an environment managed by OpenGnsys.

linux/ogagent-template.spec

@@ -8,12 +8,12 @@ BuildRoot: %{buildroot}
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Summary: OpenGnsys Agent & tools
+Summary: OpenGnsys Agent for Operating Systems
 License: BSD3
 Group: Admin
-Requires: python-six python-requests PyQt4 libXScrnSaver
+Requires: chkconfig initscripts python-six python-requests PyQt4 libXScrnSaver
 Vendor: OpenGnsys Project
-URL: https://opengnsys.es
+URL: https://opengnsys.es/
 Provides: ogagent
 
 %define _rpmdir ../

windows/py2exe-wine-linux.sh

@@ -14,7 +14,6 @@ download() {
     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://bootstrap.pypa.io/get-pip.py
-    wget -nd http://sourceforge.net/projects/pywin32/files/pywin32/Build%20221/pywin32-221.win32-py2.7.exe/download -O pywin32-install.exe
     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
@@ -34,11 +33,9 @@ install_python() {
     echo "Installing vc for python"
     $WINE msiexec /qn /i VCForPython27.msi
 
-    echo "Installing pywin32 (needs X)"
-    $WINE pywin32-install.exe
     echo "Installing py2exe (needs X)"
     $WINE py2exe-install.exe
-    echo "Installing pyqt"
+    echo "Installing pyqt (needs X)"
     $WINE pyqt-install.exe
     echo "Installing nsis (needs X?)"
     $WINE nsis-install.exe
@@ -52,6 +49,8 @@ setup_pip() {
 }
 
 install_packages() {
+    echo "Installing pywin32"
+    $WINE C:\\Python27\\python -m pip install pywin32
     echo "Installing required packages"
     $WINE C:\\Python27\\python -m pip install requests
     $WINE C:\\Python27\\python -m pip install six
@@ -68,4 +67,3 @@ install_python
 setup_pip
 install_packages
 
-