From e6988247360fa98b85915a38803d018dd353df00 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 16 Dec 2018 16:35:17 +0100
Subject: Rev: 4412

---
 mayor-orig/bin/sbin/update.sh | 22 ++++++++++++----------
 mayor-orig/bin/update.sh      |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'mayor-orig/bin')

diff --git a/mayor-orig/bin/sbin/update.sh b/mayor-orig/bin/sbin/update.sh
index 53735e6d..526d862a 100644
--- a/mayor-orig/bin/sbin/update.sh
+++ b/mayor-orig/bin/sbin/update.sh
@@ -1,22 +1,24 @@
 #!/bin/sh
 
+echo "mayor naplo sbin / update.sh"
+
 DIR=/var/mayor
 REV="$DIR/www/include/config/rev.php"
 PARENT="haladasi/haladasi haladasi/stat  osztalyozo/diak osztalyozo/jegy osztalyozo/dolgozat bejegyzesek/bejegyzesek tanev/fogadoOra tanev/helyettesites tanev/munkaterv tanev/orarend intezmeny/valtas hianyzas/diak hianyzas/nap hianyzas/info uzeno/uzeno ertekeles/ertekeles hirnok/hirnok hirnok/hirnokFeliratkozas"
 PUBLIC="tanev/orarend tanev/szabadTerem tanev/helyettesites"
 WRITABLE="download/private/export download/private/osztalyozo download/private/nyomtatas/osztalyozo download/private/nyomtatas/haladasi"
 
-svn --force export https://blyck.vmg.sulinet.hu/svn/trunk/mayor-base/www /var/mayor/www/
-# svn --force export https://blyck.vmg.sulinet.hu/svn/trunk/mayor-keptar/www /var/mayor/www/
-# svn --force export https://blyck.vmg.sulinet.hu/svn/trunk/mayor-honosito/www /var/mayor/www/
-# svn --force export https://blyck.vmg.sulinet.hu/svn/trunk/mayor-portal/www /var/mayor/www/
-svn --force export https://blyck.vmg.sulinet.hu/svn/trunk/mayor-naplo/install/module-naplo/mysql /var/mayor/install/module-naplo/mysql
-svn --force export http://blyck.vmg.sulinet.hu/svn/trunk/mayor-base/print /var/mayor/print
-svn --force export http://blyck.vmg.sulinet.hu/svn/trunk/mayor-naplo/print /var/mayor/print
-svn --force export http://blyck.vmg.sulinet.hu/svn/trunk/mayor-naplo/print /var/mayor/download
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-base/www /var/mayor/www/
+# svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-keptar/www /var/mayor/www/
+# svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-honosito/www /var/mayor/www/
+# svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-portal/www /var/mayor/www/
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-naplo/install/module-naplo/mysql /var/mayor/install/module-naplo/mysql
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-base/print /var/mayor/print
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-naplo/print /var/mayor/print
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-naplo/print /var/mayor/download
 chown -R www-data.www-data /var/mayor/download
-svn --force export http://blyck.vmg.sulinet.hu/svn/trunk/mayor-base/data/base /var/mayor/data/base
-svn --force export https://blyck.vmg.sulinet.hu/svn/trunk/mayor-naplo/www /var/mayor/www/ | grep revision | cut -d ' ' -f 3 | uniq > $REV
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-base/data/base /var/mayor/data/base
+svn --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-naplo/www /var/mayor/www/ | grep revision | cut -d ' ' -f 3 | uniq > $REV
 
 for f in $PARENT; do
     ln -s $DIR/www/policy/private/naplo/$f-pre.php $DIR/www/policy/parent/naplo/$f-pre.php
diff --git a/mayor-orig/bin/update.sh b/mayor-orig/bin/update.sh
index 0be82608..39338119 100644
--- a/mayor-orig/bin/update.sh
+++ b/mayor-orig/bin/update.sh
@@ -137,12 +137,12 @@ if [ "$EXECONLY" != "1" ]; then
 	if [ "$HTTP_SERVER" == '' ]; then
 	    if [ -f $SVN ]; then
 		# frissítés SVN-ből
-		$SVN --force export https://svn.mayor.hu/svn/trunk/mayor-base/bin "$BASEDIR/bin" > /dev/null
+		$SVN --force export svn+ssh://svn.mayor.hu/var/svn/trunk/mayor-base/bin "$BASEDIR/bin" > /dev/null
 		for MODULE in $MODULES; do
 		    echo -n "     $MODULE... "
 		    chmod +x $BASEDIR/bin/mayor
 		    if [ $? != 0 ]; then exit 2; fi
-		    UJ_REV=`$SVN --force export https://svn.mayor.hu/svn/trunk/$MODULE/update "$BASEDIR/update" | grep revision | cut -d ' ' -f 3 | uniq | sed -e 's/\.//g'`
+		    UJ_REV=`$SVN --force export svn+ssh://svn.mayor.hu/var/svn/trunk/$MODULE/update "$BASEDIR/update" | grep revision | cut -d ' ' -f 3 | uniq | sed -e 's/\.//g'`
 		    if [ $? != 0 ]; then exit 3; fi
 		    echo "kész."
 		done
-- 
cgit v1.2.3