#914: Adapting all scripts to use the `master` branch.

10 files changed, 13 insertions, 12 deletions

diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib
index 3ad38d15..972f0fe2 100755
--- a/client/boot-tools/boottoolsfunctions.lib
+++ b/client/boot-tools/boottoolsfunctions.lib
@@ -149,7 +149,7 @@ case "${1,,}" in
 		exit 1
 		;;
 esac
-BRANCH="devel"
+BRANCH="master"
 GITURL="https://api.github.com/repos/opengnsys/OpenGnsys/commits?sha=$BRANCH&path=/client"
 GITRELEASE=$(curl -s "$GITURL" | jq -r '"r" + (.[0].commit.committer.date | split("-") | join("")[:8]) + "." + (.[0].sha[:7])')
 NAMEISOCLIENT="$VERSIONBOOTTOOLS-$OSCODENAME-$OSRELEASE-$OSARCH-$GITRELEASE"
diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh
index 71f7c7c0..201e67f9 100755
--- a/installer/ogagent-devel-installer.sh
+++ b/installer/ogagent-devel-installer.sh
@@ -12,8 +12,8 @@
 
 # Variables.
 PROGDIR="$PWD/ogagent"
-BRANCH="branches/devel"
-SVNURL="https://github.com/opengnsys/OpenGnsys/$BRANCH/admin/Sources/Clients/ogagent"
+BRANCH="master"
+SVNURL="https://github.com/opengnsys/OpenGnsys/branches/$BRANCH/admin/Sources/Clients/ogagent"
 
 # Show prerequisites needed to build the environment.
 mkdir -p $PROGDIR || exit 1
diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh
index 30df2f37..e2f13d50 100755
--- a/installer/opengnsys_import.sh
+++ b/installer/opengnsys_import.sh
@@ -35,8 +35,8 @@ MYSQLFILE="$TMPDIR/$CATALOG.sql"
 MYSQLBCK="$OPENGNSYS/doc/$CATALOG.sql-$DATE"
 
 LOG_FILE=$OPENGNSYS/log/${PROG%.sh}.log
-BRANCH="branches/devel"
-SVN_URL="https://github.com/opengnsys/OpenGnsys/$BRANCH/admin/Database"
+BRANCH="master"
+SVN_URL="https://github.com/opengnsys/OpenGnsys/branches/$BRANCH/admin/Database"
 DEFAULT_MYSQL_ROOT_PASSWORD="passwordroot"      # Clave por defecto root de MySQL
 
 # Si se solicita, mostrar ayuda.
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 42e2db01..39ca5e91 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -132,7 +132,7 @@ function globalSetup ()
 	else
 		REMOTE=1
 	fi
-	BRANCH="devel"
+	BRANCH="master"
 	CODE_URL="https://codeload.github.com/opengnsys/OpenGnsys/zip/$BRANCH"
 	API_URL="https://api.github.com/repos/opengnsys/OpenGnsys/branches/$BRANCH"
 
diff --git a/installer/opengnsys_makecompress.sh b/installer/opengnsys_makecompress.sh
index 6b09deb5..a15d5434 100755
--- a/installer/opengnsys_makecompress.sh
+++ b/installer/opengnsys_makecompress.sh
@@ -21,7 +21,7 @@ for PROG in jq unzip; do
 done
 
 # Variables.
-BRANCH="devel"
+BRANCH="master"
 CODE_URL="https://codeload.github.com/opengnsys/OpenGnsys/zip/$BRANCH"
 API_URL="https://api.github.com/repos/opengnsys/OpenGnsys/branches/$BRANCH"
 REVISION=$(curl -s "$API_URL" | jq '"r" + (.commit.commit.committer.date | split("-") | join("")[:8]) + "." + (.commit.sha[:7])')
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 00f10ab8..5d7b8ec8 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -73,7 +73,7 @@ if [ -d "$PROGRAMDIR/../installer" ]; then
 else
 	REMOTE=1
 fi
-BRANCH="devel"
+BRANCH="master"
 CODE_URL="https://codeload.github.com/opengnsys/OpenGnsys/zip/$BRANCH"
 API_URL="https://api.github.com/repos/opengnsys/OpenGnsys/branches/$BRANCH"
 RAW_URL="https://raw.githubusercontent.com/opengnsys/OpenGnsys/$BRANCH"
diff --git a/installer/vagrant/Vagrantfile-boottools-vbox b/installer/vagrant/Vagrantfile-boottools-vbox
index 14306402..82cae850 100644
--- a/installer/vagrant/Vagrantfile-boottools-vbox
+++ b/installer/vagrant/Vagrantfile-boottools-vbox
@@ -24,7 +24,8 @@ apt-get install -y jq subversion syslinux syslinux-efi syslinux-utils
 groupadd opengnsys
 mkdir -p /opt/opengnsys/client /tmp/opengnsys_installer/opengnsys
 ln -fs /var/lib/tftpboot /opt/opengnsys
-svn export https://github.com/opengnsys/OpenGnsys/branches/devel/client /tmp/opengnsys_installer/opengnsys/client
+BRANCH="master"
+svn export https://github.com/opengnsys/OpenGnsys/branches/$BRANCH/client /tmp/opengnsys_installer/opengnsys/client
 echo "Connect to this VM, launch boot-tools generation script and follow instructions:"
 echo "    sudo /tmp/opengnsys_installer/opengnsys/client/boot-tools/boottoolsgenerator.sh"
 echo "Warning: this process may take a long time."
diff --git a/installer/vagrant/Vagrantfile-browser-vbox b/installer/vagrant/Vagrantfile-browser-vbox
index 8e3abebf..d723abbd 100644
--- a/installer/vagrant/Vagrantfile-browser-vbox
+++ b/installer/vagrant/Vagrantfile-browser-vbox
@@ -29,7 +29,7 @@ echo "yes" | ./configure -opensource -embedded x86 -webkit -openssl -qt-gfx-vnc
 make
 make install
 # Compile the Browser.
-BRANCH="devel"
+BRANCH="master"
 svn export "https://github.com/opengnsys/OpenGnsys/branches/$BRANCH/client/browser" ../browser
 cd ../browser
 qmake browser.pro
diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox
index c558227a..70bad3ac 100644
--- a/installer/vagrant/Vagrantfile-devel-vbox
+++ b/installer/vagrant/Vagrantfile-devel-vbox
@@ -43,7 +43,7 @@ if which curl &>/dev/null; then
 elif which wget &>/dev/null; then
     DOWNLOAD="wget -q -O -"
 fi
-BRANCH="devel"
+BRANCH="master"
 $DOWNLOAD "https://raw.githubusercontent.com/opengnsys/OpenGnsys/$BRANCH/installer/opengnsys_installer.sh" | bash || exit $?
 mv /opt/opengnsys/log/bash.log /opt/opengnsys/log/opengnsys_installer.log
 echo y | /opt/opengnsys/bin/setserveraddr $(ip -o link show | tail -1 | cut -d: -f2)
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index 1bf48faa..7b7753db 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -33,7 +33,7 @@ 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.
-BRANCH="devel"
+BRANCH="master"
 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.