#914: Update OGAgent creation dependencies and installation instructions.

oglive
Ramón M. Gómez 2019-10-09 08:08:23 +02:00
parent 31159d4285
commit d3dd7cfbac
4 changed files with 24 additions and 24 deletions

View File

@ -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,12 +27,11 @@ install-ogagent:
mkdir -p $(CFGDIR)
mkdir -p $(XDGAUTOSTARTDIR)
mkdir -p $(KDEAUTOSTARTDIR)
mkdir $(LIBDIR)/img
mkdir -p $(LIBDIR)/img
# Cleans up .pyc and cache folders
rm -f $(PYC) $(CACHES)
cp -r $(SOURCEDIR)/opengnsys $(LIBDIR)/opengnsys
cp -r $(SOURCEDIR)/cfg $(LIBDIR)/cfg
cp $(SOURCEDIR)/img/oga.png $(LIBDIR)/img
@ -40,22 +40,24 @@ 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)
cp desktop/OGAgentTool.desktop $(KDEAUTOSTARTDIR)
# scripts
cp scripts/ogagent $(BINDIR)
cp scripts/OGAgentTool-startup $(BINDIR)
cp scripts/OGAgentTool $(BINDIR)
# Fix permissions
chmod 755 $(BINDIR)/ogagent
chmod 755 $(BINDIR)/OGAgentTool-startup
chmod 755 $(LIBDIR)/OGAgentUser.py
chmod 600 $(LIBDIR)/cfg/ogagent.cfg
# If for red hat based, copy init.d
ifeq ($(DISTRO),rh)
mkdir -p $(INITDIR)
@ -64,8 +66,7 @@ ifeq ($(DISTRO),rh)
ln -fs /usr/share/OGAgent/cfg/ogagent.cfg $(CFGDIR)
ln -fs /usr/share/OGAgent/cfg/ogclient.cfg $(CFGDIR)
endif
# chmod 0755 $(BINDIR)/ogagent
uninstall:
rm -rf $(LIBDIR)
# rm -f $(BINDIR)/ogagent

View File

@ -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.

View File

@ -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 ../

View File

@ -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
@ -27,32 +26,32 @@ install_python() {
echo "Setting up wine prefix (using winetricks)"
winetricks
fi
cd downloads
echo "Installing python"
$WINE msiexec /qn /i python-2.7.msi
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
cd ..
}
setup_pip() {
echo "Seting up pip..."
$WINE C:\\Python27\\python -m pip install --upgrade pip
}
}
install_packages() {
echo "Installing required 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
# Using easy_install instead of pip to install pycrypto
@ -68,4 +67,3 @@ install_python
setup_pip
install_packages