diff options
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/ogagent-devel-installer.sh | 10 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-ogagent-vbox | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh index 18574ed2..71f7c7c0 100755 --- a/installer/ogagent-devel-installer.sh +++ b/installer/ogagent-devel-installer.sh @@ -11,8 +11,9 @@ # Variables. -PROGDIR=$PWD/ogagent -SVNURL=https://opengnsys.es/svn/branches/version1.1/admin/Sources/Clients/ogagent +PROGDIR="$PWD/ogagent" +BRANCH="branches/devel" +SVNURL="https://github.com/opengnsys/OpenGnsys/$BRANCH/admin/Sources/Clients/ogagent" # Show prerequisites needed to build the environment. mkdir -p $PROGDIR || exit 1 @@ -22,20 +23,21 @@ OGAgent devoloping environment installation Prerequisites: - Install packages, if needed: + - Subversion - Wine for 32-bit (Winetricks may be required) - Python 2.7 with pyqt4-dev-tools - realpath - dpkg-dev - rpmbuild - xar -- Open a web browser and download Microsoft Visual C++ 2010 Redistributable Package (x86) from: http://www.microsoft.com/en-us/download/details.aspx?id=5555 -- Copy or move "vcredist_x86.exe" file to $PROGDIR directory. Press [Enter] key when ready to continue. EOT read # Importing OGAgent source code. svn export --force $SVNURL $PROGDIR || exit 1 +# Downloading Visual C++ Redistributable. +wget --unlink https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe # Update PyQt components. pushd ogagent/src >/dev/null diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox index 9e909973..1bf48faa 100644 --- a/installer/vagrant/Vagrantfile-ogagent-vbox +++ b/installer/vagrant/Vagrantfile-ogagent-vbox @@ -33,7 +33,9 @@ wget -q https://atom.io/download/rpm -O /tmp/atom.rpm && dnf install -y /tmp/ato # Comment out next line if you prefer to install Eclipse IDE for Python (it needs more disk space). #dnf install -y eclipse-pydev eclipse-nls-${LANG%_*} # Download OGAgent environment installer. -wget -q https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/ogagent-devel-installer.sh -O /home/vagrant/ogagent-devel-installer.sh +BRANCH="devel" +wget -qc --unlink https://raw.githubusercontent.com/opengnsys/OpenGnsys/$BRANCH/installer/ogagent-devel-installer.sh -O /home/vagrant/ogagent-devel-installer.sh +chmod +x /home/vagrant/ogagent-devel-installer.sh # Instructions. echo "Manual operations:" echo "- Reboot VM or launch desktop: startxfce4 &" @@ -60,7 +62,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.gui = true end # VM base and host name. - ag.vm.box = "fedora/25-cloud-base" + ag.vm.box = "fedora/27-cloud-base" ag.vm.hostname = "ogAgent" # Comment to disable synced folder. ag.vm.synced_folder ".", "/vagrant" |