diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-09-27 15:16:03 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-09-27 15:16:03 +0200 |
| commit | 8607e55570ef9f8e59366d35339ccb92d60b033d (patch) | |
| tree | 5ebecd09d5a5c229cc09c377a374df2f7dbdfbd8 /installer/opengnsys_import.sh | |
| parent | 9bcea48e05b32decff286e8d1ebe2a15e8c48b98 (diff) | |
#872: Incorporar código de los tickets #835 y #840 en rama principal.
Diffstat (limited to 'installer/opengnsys_import.sh')
| -rwxr-xr-x | installer/opengnsys_import.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh index e3a04c17..3352a344 100755 --- a/installer/opengnsys_import.sh +++ b/installer/opengnsys_import.sh @@ -33,7 +33,8 @@ MYSQLFILE="$TMPDIR/$CATALOG.sql" MYSQLBCK="$OPENGNSYS/doc/$CATALOG.sql-$DATE" LOG_FILE=$OPENGNSYS/log/${PROG%.sh}.log -OPENGNSYS_SERVER="opengnsys.es" +BRANCH="branches/master" +SVN_URL="https://github.com/opengnsys/OpenGnsys/$BRANCH/admin/Database" DEFAULT_MYSQL_ROOT_PASSWORD="passwordroot" # Clave por defecto root de MySQL # Si se solicita, mostrar ayuda. @@ -231,7 +232,6 @@ if [ $OLDVERSION != $NEWVERSION ] ; then exit 0 fi # Nos bajamos los archivos de actualización de la base de datos - SVN_URL="https://$OPENGNSYS_SERVER/svn/tags/opengnsys-$NEWVERSION/admin/Database" [[ "$NEWVERSION" =~ pre ]] && SVN_URL="https://$OPENGNSYS_SERVER/svn/branches/version${NEWVERSION%.*}/admin/Database" svn checkout "$SVN_URL" $TMPDIR/Database [ $? -ne 0 ] && errorAndLog "$PROG: Error getting code from $SVN_URL" && exit 6 |