From 6ba44e0b4a529b2d7d7d74aa7e66360b2f28c84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Kopp?= <kopp@ufal.mff.cuni.cz>
Date: Wed, 12 Jun 2024 15:39:56 +0200
Subject: [PATCH] change setting for mac #3

---
 admin/env_refactored.sh       | 8 +++++---
 admin/mac_backup_previous.sh  | 2 +-
 admin/mac_download_release.sh | 4 ++--
 admin/mac_prepare.sh          | 4 ++--
 admin/mac_release.sh          | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/admin/env_refactored.sh b/admin/env_refactored.sh
index 58d3d6621..60778cf74 100644
--- a/admin/env_refactored.sh
+++ b/admin/env_refactored.sh
@@ -63,12 +63,14 @@ INSTALL_DOC=${INSTALL_BASE}/doc
 RSS=${WWW}/tred/changelog.rss
 
 # Basic paths
-TRED_SVN=https://svn.ms.mff.cuni.cz/svn/TrEd
+TRED_SVN=SVN:ERROR--https://svn.ms.mff.cuni.cz/svn/TrEd
 TRED_SVN_REPO=${TRED_SVN}/trunk/tred_refactored
 TRED_SVN_EXT=${TRED_SVN}/extensions
 TREEX_PML_REPO=https://svn.ms.mff.cuni.cz/svn/perl_libs/trunk/distribution/Treex-PML
 WIN32_DIST_REPO=https://svn.ms.mff.cuni.cz/svn/perl_libs/trunk/distribution/win32_build_script
 
+TRED_FOLDER=tred_refactored
+TRED_GIT_REPO=${GIT_DIR}/${TRED_FOLDER}
 TRED_GIT_EXT=git@github.com:ufal/TrEd-extensions.git
 # https://github.com/ufal/TrEd-extensions.git
 
@@ -106,7 +108,7 @@ CHANGELOG_TO_RSS=${ADMIN_DIR}/changelog2rss.pl
 
 
 ## MAC OS settings
-MAC_RELEASER=kopp@manfred.ms.mff.cuni.cz
+MAC_RELEASER=mMcBair.local
 MAC_TRED_INSTALLATION='~/tred_installation'
 MAC_TRED_INSTALLATION_OLD='~/tred_installation_old'
-MAC_GIT_DIR='~/TrEd'
\ No newline at end of file
+MAC_GIT_DIR='~/work/TrEd'
\ No newline at end of file
diff --git a/admin/mac_backup_previous.sh b/admin/mac_backup_previous.sh
index b05a81476..2befd4f7e 100755
--- a/admin/mac_backup_previous.sh
+++ b/admin/mac_backup_previous.sh
@@ -3,5 +3,5 @@
 . env.sh
 ssh $MAC_RELEASER <<EOF
   rm -rf $MAC_TRED_INSTALLATION_OLD;
-  mv $MAC_TRED_INSTALLATION $MAC_TRED_INSTALLATION_OLD;
+  mv $MAC_TRED_INSTALLATION $MAC_TRED_INSTALLATION_OLD || echo "no previous release to backup";
 EOF
\ No newline at end of file
diff --git a/admin/mac_download_release.sh b/admin/mac_download_release.sh
index ba407d369..444a1fab3 100755
--- a/admin/mac_download_release.sh
+++ b/admin/mac_download_release.sh
@@ -2,12 +2,12 @@
 
 . env.sh
 
-SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'`
+GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"`
 
 echo "Copying tred.dmg to local www"
 scp $MAC_RELEASER:$MAC_TRED_INSTALLATION/tred.dmg "${TREDWWW}/tred/"
 
 # keep history of released versions in subdir releases/osx
 mkdir -p "${TREDWWW}/tred/releases/osx" 2>/dev/null
-DMG_FILE="tred_2.${SVN_VERSION}.dmg"
+DMG_FILE="tred_3.${GIT_DATE}.dmg"
 cp "${TREDWWW}/tred/tred.dmg" "${TREDWWW}/tred/releases/osx/$DMG_FILE"
\ No newline at end of file
diff --git a/admin/mac_prepare.sh b/admin/mac_prepare.sh
index acc98595c..76194514f 100755
--- a/admin/mac_prepare.sh
+++ b/admin/mac_prepare.sh
@@ -9,6 +9,6 @@ scp ${WWW}/tred/tred-current.tar.gz $MAC_RELEASER:$MAC_TRED_INSTALLATION
 scp ${WWW}/tred/tred-dep-unix.tar.gz $MAC_RELEASER:$MAC_TRED_INSTALLATION
 ssh $MAC_RELEASER <<EOF
     chmod +x $MAC_TRED_INSTALLATION/install_tred.bash
-	cd TrEd && svn update || echo "Unable to update repository. Do it manually if needed!!!\nContinues without repository updated.\n"
-	cd ~/TrEd/trunk/osx_install/bin && ./unpack.sh && mv release-template.dmg ../scripts
+	cd ${MAC_GIT_DIR} && git pull  || echo "Unable to update repository. Do it manually if needed!!!\nContinues without repository updated.\n"
+	cd ${MAC_GIT_DIR}/osx_install/bin && ./unpack.sh && mv release-template.dmg ../scripts
 EOF
\ No newline at end of file
diff --git a/admin/mac_release.sh b/admin/mac_release.sh
index 22eae316a..31aaee343 100755
--- a/admin/mac_release.sh
+++ b/admin/mac_release.sh
@@ -9,5 +9,5 @@ ssh $MAC_RELEASER <<EOF
   #  echo "======== perl version"
   #  perlbrew info
   #  echo "========"
-	cd $MAC_SVN_DIR/trunk/osx_install/scripts && ./make-release.sh $SIGNATURE
+	cd ${MAC_GIT_DIR}/osx_install/scripts && ./make-release.sh $SIGNATURE
 EOF