From fe907ad6839534e1f4c1ce51156cc99465b0f1ca Mon Sep 17 00:00:00 2001
From: Harald Milz <hm@seneca.muc.de>
Date: Wed, 27 Mar 2019 09:34:41 +0100
Subject: [PATCH] changing icalparser integration and package building

---
 Makefile               | 20 ++++++++++++++------
 gcal-import-worker.php |  8 ++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 395faf6..3f2ea4f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,26 @@
 NAME = kal3000-gcal-import
 ICALPARSER = icalparser
 INSTALLDIR = /usr/share/wordpress/wp-content/plugins/$(NAME)
+SSHACCOUNT = root@ubuntu1804
 VERSION = 0.1.0
 
-release: 
-	( cd .. ; zip -9 -r $(NAME)-$(VERSION).zip $(ICALPARSER)/readme.md $(ICALPARSER)/src/* $(ICALPARSER)/tools/* $(NAME)/*.php $(NAME)/*.txt)
 
-install: 
-	mkdir -p $(INSTALLDIR)
-	cp -vu *.txt *.php $(INSTALLDIR)
-	chown -R www-data:www-data $(INSTALLDIR)
+# Make sure we always ship the latest icalparser version
+icalparser:
+	if [ -d icalparser ] ; then \
+		cd icalparser && git pull ; \
+	else \
+		git clone https://github.com/OzzyCzech/icalparser ; \
+	fi 
 
 
+release: icalparser 
+	cd .. ; \
+	zip -9 -r $(NAME)-$(VERSION).zip $(NAME)/$(ICALPARSER)/readme.md $(NAME)/$(ICALPARSER)/src/* $(NAME)/$(ICALPARSER)/tools/* $(NAME)/*.php $(NAME)/readme.* $(NAME)/README.*
 
 
+install: icalparser
+	rsync --delete -C -av ./ $(SSHACCOUNT):$(INSTALLDIR)
+	ssh $(SSHACCOUNT) chown -R www-data:www-data $(INSTALLDIR)
 
 
diff --git a/gcal-import-worker.php b/gcal-import-worker.php
index 5dc1101..f8577cb 100644
--- a/gcal-import-worker.php
+++ b/gcal-import-worker.php
@@ -201,10 +201,10 @@ function gcal_import_do_import($category, $link) {
 
     error_log ("entering gcal_import_do_import($category, $link)");
    
-	require_once dirname (__FILE__) . '/../icalparser/src/IcalParser.php';
-	require_once dirname (__FILE__) . '/../icalparser/src/Recurrence.php';
-	require_once dirname (__FILE__) . '/../icalparser/src/Freq.php';
-	require_once dirname (__FILE__) . '/../icalparser/src/WindowsTimezones.php';
+	require_once dirname (__FILE__) . '/icalparser/src/IcalParser.php';
+	require_once dirname (__FILE__) . '/icalparser/src/Recurrence.php';
+	require_once dirname (__FILE__) . '/icalparser/src/Freq.php';
+	require_once dirname (__FILE__) . '/icalparser/src/WindowsTimezones.php';
 
 	$cal = new \om\IcalParser();
 	$results = $cal->parseFile($link);