diff options
5 files changed, 10 insertions, 12 deletions
diff --git a/admin/Sources/Clients/ogagent/macos/build-pkg.sh b/admin/Sources/Clients/ogagent/macos/build-pkg.sh index 9338bd26..02cf165d 100755 --- a/admin/Sources/Clients/ogagent/macos/build-pkg.sh +++ b/admin/Sources/Clients/ogagent/macos/build-pkg.sh @@ -6,7 +6,7 @@ VERSION=1.1.0 AUTHOR="OpenGnsys Project" # Create directories. -mkdir build && cd build +mkdir -p build && cd build mkdir -p flat/base.pkg flat/Resources/en.lproj mkdir -p root/Applications @@ -79,6 +79,7 @@ cat << EOT > flat/Distribution </installer-script> EOT -# Create Xar application archive. -( cd flat && xar --compression none -cf "../../../OGAgent-$VERSION Installer.pkg" * ) +# Create new Xar application archive. +rm -f ../../../OGAgentInstaller-$VERSION.pkg +( cd flat && xar --compression none -cf "../../../OGAgentInstaller-$VERSION.pkg" * ) diff --git a/admin/Sources/Clients/ogagent/macos/scripts/es.opengnsys.ogagent.plist b/admin/Sources/Clients/ogagent/macos/scripts/es.opengnsys.ogagent.plist index 1ea8dd07..5ec11fa5 100644 --- a/admin/Sources/Clients/ogagent/macos/scripts/es.opengnsys.ogagent.plist +++ b/admin/Sources/Clients/ogagent/macos/scripts/es.opengnsys.ogagent.plist @@ -5,15 +5,11 @@ <string>es.opengnsys.ogagent</string> <key>ProgramArguments</key> <array> - <string>/usr/local/bin/ogagent</string> + <string>/usr/bin/ogagent</string> <string>start</string> </array> <key>RunAtLoad</key> <true/> - <key>StandardOutPath</key> - <string>/var/log/ogagent.log</string> - <key>StandardErrorPath</key> - <string>/var/log/ogagent.err</string> </dict> </plist> diff --git a/admin/Sources/Clients/ogagent/macos/scripts/postinstall b/admin/Sources/Clients/ogagent/macos/scripts/postinstall index 4c092ca1..007f77c4 100755 --- a/admin/Sources/Clients/ogagent/macos/scripts/postinstall +++ b/admin/Sources/Clients/ogagent/macos/scripts/postinstall @@ -2,7 +2,7 @@ # Directories SRCDIR=$(dirname "$0") -BINDIR=/usr/local/bin +BINDIR=/usr/bin INITDIR=/Library/LaunchDaemons # Dependencies: 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 |