summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2017-03-02 13:14:04 +0000
committerramon <ramongomez@us.es>2017-03-02 13:14:04 +0000
commit8db55ed4f9e089a4deb7fb1f1cba807126d435a8 (patch)
tree340df28c220217a33568cfd7b76631b84bf8d511 /installer
parent103bc8272567329aa76d4d0a13ffa521e30a6bdf (diff)
#718: OGAgent para macOS: aƱadir dependencia a la MV Vagrant; crear fichero {{{pkg}}} sin espacios y evitar error al instalar OGAgent si no existe {{{/usr/local}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5218 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/ogagent-devel-installer.sh5
-rw-r--r--installer/vagrant/Vagrantfile-ogagent-vbox2
2 files changed, 4 insertions, 3 deletions
diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh
index ec8b9f7c..44af1c3a 100755
--- a/installer/ogagent-devel-installer.sh
+++ b/installer/ogagent-devel-installer.sh
@@ -63,8 +63,9 @@ ln -s ../../.. wine/drive_c/ogagent
popd >/dev/null
# Download, compile and install bomutils.
-svn export https://github.com/hogliux/bomutils.git/trunk ogagent/macos/bomutils
-pushd ogagent/macos/bomutils >/dev/null
+mkdir -p ogagent/macos/downloads
+svn export https://github.com/hogliux/bomutils.git/trunk ogagent/macos/downloads/bomutils
+pushd ogagent/macos/downloads/bomutils >/dev/null
make && make install
popd >/dev/null
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index e30ff154..d2a49aed 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -21,7 +21,7 @@ localectl set-x11-keymap ${LANG%_*}
# Update repositories.
dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
# Install main dependencies.
-dnf install -y debhelper dpkg-dev pyqt4-devel rpm-build subversion samba-winbind wine.i686 mingw32-wine-gecko wine-mono cabextract xar
+dnf install -y gcc-c++ debhelper dpkg-dev pyqt4-devel rpm-build subversion samba-winbind wine.i686 mingw32-wine-gecko wine-mono cabextract xar
# Install desktop (XFCE) and GUI utils.
dnf install -y @xfce-desktop-environment firefox VirtualBox-guest kmod-VirtualBox akmod-VirtualBox akmods
systemctl set-default graphical.target