From e7525fda5618d918c6060109506bda59d88cb92d Mon Sep 17 00:00:00 2001
From: root <root@vbox.florz.net>
Date: Thu, 17 May 2018 16:11:27 +0200
Subject: [PATCH] moved includes and cleaned up paths

---
 chch-calendar.sh                                    | 12 ++++++++----
 chch-status.sh                                      | 13 +++++++------
 chch.json.template => include/chch.json.template    |  0
 .../chch_ical2mediawiki.php                         |  0
 {icalparser => include/icalparser}/.travis.yml      |  0
 {icalparser => include/icalparser}/LICENSE          |  0
 {icalparser => include/icalparser}/composer.json    |  0
 .../icalparser}/example/index.php                   |  0
 {icalparser => include/icalparser}/readme.md        |  0
 {icalparser => include/icalparser}/src/Freq.php     |  0
 .../icalparser}/src/IcalParser.php                  |  0
 .../icalparser}/src/Recurrence.php                  |  0
 .../icalparser}/src/WindowsTimezones.php            |  0
 .../icalparser}/tests/blank_description.phpt        |  0
 .../icalparser}/tests/cal/FrenchHolidays.ics        |  0
 .../icalparser}/tests/cal/basic.ics                 |  0
 .../icalparser}/tests/cal/blank_description.ics     |  0
 .../icalparser}/tests/cal/blank_line_end.ics        |  0
 .../icalparser}/tests/cal/blank_line_mid.ics        |  0
 .../icalparser}/tests/cal/daily_recur.ics           |  0
 .../icalparser}/tests/cal/daily_recur2.ics          |  0
 .../icalparser}/tests/cal/day_long_recur_yearly.ics |  0
 .../icalparser}/tests/cal/forced_types.ics          |  0
 .../icalparser}/tests/cal/google_birthday.ics       |  0
 .../icalparser}/tests/cal/minimal.ics               |  0
 .../icalparser}/tests/cal/multiline_description.ics |  0
 .../icalparser}/tests/cal/multiple_attachments.ics  |  0
 .../icalparser}/tests/cal/multiple_rrules.ics       |  0
 .../icalparser}/tests/cal/parserv2.ics              |  0
 .../icalparser}/tests/cal/readme.md                 |  0
 .../icalparser}/tests/cal/recur_instances.ics       |  0
 .../tests/cal/recur_instances_finite.ics            |  0
 .../cal/recur_instances_with_modifications.ics      |  0
 ...ur_instances_with_modifications_and_interval.ics |  0
 ...ur_instances_with_modifications_to_first_day.ics |  0
 .../icalparser}/tests/cal/utc_negative_zero.ics     |  0
 .../tests/cal/weird_windows_timezones.ics           |  0
 .../icalparser}/tests/cal/wrong_dates.ics           |  0
 .../icalparser}/tests/multiline_description.phpt    |  0
 .../icalparser}/tests/multiple_attachments.phpt     |  0
 .../icalparser}/tests/recurring_events.phpt         |  0
 .../icalparser}/tests/sort_events.phpt              |  0
 .../icalparser}/tests/timezone.phpt                 |  0
 .../icalparser}/tests/wrong_dates.phpt              |  0
 .../icalparser}/tools/windowstimezones.php          |  0
 45 files changed, 15 insertions(+), 10 deletions(-)
 rename chch.json.template => include/chch.json.template (100%)
 rename chch_ical2mediawiki.php => include/chch_ical2mediawiki.php (100%)
 rename {icalparser => include/icalparser}/.travis.yml (100%)
 rename {icalparser => include/icalparser}/LICENSE (100%)
 rename {icalparser => include/icalparser}/composer.json (100%)
 rename {icalparser => include/icalparser}/example/index.php (100%)
 rename {icalparser => include/icalparser}/readme.md (100%)
 rename {icalparser => include/icalparser}/src/Freq.php (100%)
 rename {icalparser => include/icalparser}/src/IcalParser.php (100%)
 rename {icalparser => include/icalparser}/src/Recurrence.php (100%)
 rename {icalparser => include/icalparser}/src/WindowsTimezones.php (100%)
 rename {icalparser => include/icalparser}/tests/blank_description.phpt (100%)
 rename {icalparser => include/icalparser}/tests/cal/FrenchHolidays.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/basic.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/blank_description.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/blank_line_end.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/blank_line_mid.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/daily_recur.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/daily_recur2.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/day_long_recur_yearly.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/forced_types.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/google_birthday.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/minimal.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/multiline_description.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/multiple_attachments.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/multiple_rrules.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/parserv2.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/readme.md (100%)
 rename {icalparser => include/icalparser}/tests/cal/recur_instances.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/recur_instances_finite.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/recur_instances_with_modifications.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/recur_instances_with_modifications_and_interval.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/recur_instances_with_modifications_to_first_day.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/utc_negative_zero.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/weird_windows_timezones.ics (100%)
 rename {icalparser => include/icalparser}/tests/cal/wrong_dates.ics (100%)
 rename {icalparser => include/icalparser}/tests/multiline_description.phpt (100%)
 rename {icalparser => include/icalparser}/tests/multiple_attachments.phpt (100%)
 rename {icalparser => include/icalparser}/tests/recurring_events.phpt (100%)
 rename {icalparser => include/icalparser}/tests/sort_events.phpt (100%)
 rename {icalparser => include/icalparser}/tests/timezone.phpt (100%)
 rename {icalparser => include/icalparser}/tests/wrong_dates.phpt (100%)
 rename {icalparser => include/icalparser}/tools/windowstimezones.php (100%)

diff --git a/chch-calendar.sh b/chch-calendar.sh
index 5cd8d79..80598a7 100755
--- a/chch-calendar.sh
+++ b/chch-calendar.sh
@@ -1,17 +1,21 @@
 #! /bin/bash
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CHCH_ICAL_SRC="https://cloud.chch.it/remote.php/dav/public-calendars/KVJE5OXYIY9B9V5C?export"
 CHCH_ICAL="/var/www/chch_api/chch.ical"
+WIKI_PATH="/var/www/chch/"
 RAND="$(date +%s)$RANDOM$RANDOM$RANDOM"
+CHCH_ICAL_TMP="/tmp/chch_$RAND.ical"
 
 rm -rf /tmp/chch_*.ical
-wget "$CHCH_ICAL_SRC" -O /tmp/chch_$RAND.ical -q -T 45
+wget "$CHCH_ICAL_SRC" -O "$CHCH_ICAL_TMP" -q -T 45
 if [ $? -ne 0 ]; then
 	echo "ERROR: wget failed to download calendar" >&2
 else
-	mv /tmp/chch_$RAND.ical $CHCH_ICAL
+	mv "$CHCH_ICAL_TMP" "$CHCH_ICAL"
 fi
 
+
 # this requires -> icalparser from https://github.com/OzzyCzech/icalparser.git
-head $CHCH_ICAL -n1 >/dev/null 2>&1 && php /etc/chch/chch_ical2mediawiki.php $CHCH_ICAL 2>/dev/null | php /var/www/chch/maintenance/edit.php -m -b --no-rc -s "automatische Aktualisierung aus dem ical feed" "Aktuelle_ChCh-Termine" >/dev/null 2>&1
-echo "Hauptseite" | php /var/www/chch/maintenance/purgeList.php --purge > /dev/null 2>&1
+head $CHCH_ICAL -n1 >/dev/null 2>&1 && php "$SCRIPT_DIR/include/chch_ical2mediawiki.php" "$CHCH_ICAL" 2>/dev/null | php "$WIKI_PATH/maintenance/edit.php" -m -b --no-rc -s "automatische Aktualisierung aus dem ical feed" "Aktuelle_ChCh-Termine" >/dev/null 2>&1
+echo "Hauptseite" | php "$WIKI_PATH/maintenance/purgeList.php" --purge > /dev/null 2>&1
diff --git a/chch-status.sh b/chch-status.sh
index f4cc432..c3b61fd 100755
--- a/chch-status.sh
+++ b/chch-status.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SSH_IP="127.0.0.1"
 SSHPORT="2322"
 SSH_USER="command"
 SSH_SUCCESS_FILE="/tmp/chch-status_ssh-success"
 JSON_FILE="/var/www/chch_api/chch.json"
-JSON_FILE_TEMPL="/etc/chch/chch.json.template"
+JSON_FILE_TEMPL="$SCRIPT_DIR/include/chch.json.template"
 JSON_FILE_TMP="$(mktemp)"
 STATUS_FILE="/tmp/chch-status"
 STATUS_OPEN="geöffnet"
@@ -34,7 +35,7 @@ if [ -z "$STATUS" ]; then
 		STATUS="$STATUS_NULL"
 	fi
 else
-	touch $SSH_SUCCESS_FILE
+	touch "$SSH_SUCCESS_FILE"
 fi
 
 TIMESTAMP_LASTCHANGE=$(stat -c '%Y' "$STATUS_FILE" 2>/dev/null) || TIMESTAMP_LASTCHANGE=$(date +%s)
@@ -82,10 +83,10 @@ case $STATUS in
 esac
 
 # The status file for spaceapi.ccc.de and for our IRC bot.
-sed "s/%%STATUS%%/${API_STATUS}/;s/%%MESSAGE%%/${API_STATUS_MSG}/;s/%%LASTCHANGE%%/${TIMESTAMP_LASTCHANGE}/" $JSON_FILE_TEMPL > $JSON_FILE_TMP
-chown --reference=$JSON_FILE_TEMPL $JSON_FILE_TMP
-chmod --reference=$JSON_FILE_TEMPL $JSON_FILE_TMP
-mv $JSON_FILE_TMP $JSON_FILE
+sed "s/%%STATUS%%/${API_STATUS}/;s/%%MESSAGE%%/${API_STATUS_MSG}/;s/%%LASTCHANGE%%/${TIMESTAMP_LASTCHANGE}/" "$JSON_FILE_TEMPL" > "$JSON_FILE_TMP"
+chown --reference="$JSON_FILE_TEMPL" "$JSON_FILE_TMP"
+chmod --reference="$JSON_FILE_TEMPL" "$JSON_FILE_TMP"
+mv "$JSON_FILE_TMP" "$JSON_FILE"
 
 echo -n "$WIKI_STATUS" | php "$WIKI_PATH/maintenance/edit.php" -m -b --no-rc -s "$STATUS" "$WIKI_STATUS_PAGE" >> /dev/null 2>&1
 echo "$WIKI_MAIN_PAGE" | php "$WIKI_PATH/maintenance/purgeList.php" --purge >> /dev/null 2>&1
diff --git a/chch.json.template b/include/chch.json.template
similarity index 100%
rename from chch.json.template
rename to include/chch.json.template
diff --git a/chch_ical2mediawiki.php b/include/chch_ical2mediawiki.php
similarity index 100%
rename from chch_ical2mediawiki.php
rename to include/chch_ical2mediawiki.php
diff --git a/icalparser/.travis.yml b/include/icalparser/.travis.yml
similarity index 100%
rename from icalparser/.travis.yml
rename to include/icalparser/.travis.yml
diff --git a/icalparser/LICENSE b/include/icalparser/LICENSE
similarity index 100%
rename from icalparser/LICENSE
rename to include/icalparser/LICENSE
diff --git a/icalparser/composer.json b/include/icalparser/composer.json
similarity index 100%
rename from icalparser/composer.json
rename to include/icalparser/composer.json
diff --git a/icalparser/example/index.php b/include/icalparser/example/index.php
similarity index 100%
rename from icalparser/example/index.php
rename to include/icalparser/example/index.php
diff --git a/icalparser/readme.md b/include/icalparser/readme.md
similarity index 100%
rename from icalparser/readme.md
rename to include/icalparser/readme.md
diff --git a/icalparser/src/Freq.php b/include/icalparser/src/Freq.php
similarity index 100%
rename from icalparser/src/Freq.php
rename to include/icalparser/src/Freq.php
diff --git a/icalparser/src/IcalParser.php b/include/icalparser/src/IcalParser.php
similarity index 100%
rename from icalparser/src/IcalParser.php
rename to include/icalparser/src/IcalParser.php
diff --git a/icalparser/src/Recurrence.php b/include/icalparser/src/Recurrence.php
similarity index 100%
rename from icalparser/src/Recurrence.php
rename to include/icalparser/src/Recurrence.php
diff --git a/icalparser/src/WindowsTimezones.php b/include/icalparser/src/WindowsTimezones.php
similarity index 100%
rename from icalparser/src/WindowsTimezones.php
rename to include/icalparser/src/WindowsTimezones.php
diff --git a/icalparser/tests/blank_description.phpt b/include/icalparser/tests/blank_description.phpt
similarity index 100%
rename from icalparser/tests/blank_description.phpt
rename to include/icalparser/tests/blank_description.phpt
diff --git a/icalparser/tests/cal/FrenchHolidays.ics b/include/icalparser/tests/cal/FrenchHolidays.ics
similarity index 100%
rename from icalparser/tests/cal/FrenchHolidays.ics
rename to include/icalparser/tests/cal/FrenchHolidays.ics
diff --git a/icalparser/tests/cal/basic.ics b/include/icalparser/tests/cal/basic.ics
similarity index 100%
rename from icalparser/tests/cal/basic.ics
rename to include/icalparser/tests/cal/basic.ics
diff --git a/icalparser/tests/cal/blank_description.ics b/include/icalparser/tests/cal/blank_description.ics
similarity index 100%
rename from icalparser/tests/cal/blank_description.ics
rename to include/icalparser/tests/cal/blank_description.ics
diff --git a/icalparser/tests/cal/blank_line_end.ics b/include/icalparser/tests/cal/blank_line_end.ics
similarity index 100%
rename from icalparser/tests/cal/blank_line_end.ics
rename to include/icalparser/tests/cal/blank_line_end.ics
diff --git a/icalparser/tests/cal/blank_line_mid.ics b/include/icalparser/tests/cal/blank_line_mid.ics
similarity index 100%
rename from icalparser/tests/cal/blank_line_mid.ics
rename to include/icalparser/tests/cal/blank_line_mid.ics
diff --git a/icalparser/tests/cal/daily_recur.ics b/include/icalparser/tests/cal/daily_recur.ics
similarity index 100%
rename from icalparser/tests/cal/daily_recur.ics
rename to include/icalparser/tests/cal/daily_recur.ics
diff --git a/icalparser/tests/cal/daily_recur2.ics b/include/icalparser/tests/cal/daily_recur2.ics
similarity index 100%
rename from icalparser/tests/cal/daily_recur2.ics
rename to include/icalparser/tests/cal/daily_recur2.ics
diff --git a/icalparser/tests/cal/day_long_recur_yearly.ics b/include/icalparser/tests/cal/day_long_recur_yearly.ics
similarity index 100%
rename from icalparser/tests/cal/day_long_recur_yearly.ics
rename to include/icalparser/tests/cal/day_long_recur_yearly.ics
diff --git a/icalparser/tests/cal/forced_types.ics b/include/icalparser/tests/cal/forced_types.ics
similarity index 100%
rename from icalparser/tests/cal/forced_types.ics
rename to include/icalparser/tests/cal/forced_types.ics
diff --git a/icalparser/tests/cal/google_birthday.ics b/include/icalparser/tests/cal/google_birthday.ics
similarity index 100%
rename from icalparser/tests/cal/google_birthday.ics
rename to include/icalparser/tests/cal/google_birthday.ics
diff --git a/icalparser/tests/cal/minimal.ics b/include/icalparser/tests/cal/minimal.ics
similarity index 100%
rename from icalparser/tests/cal/minimal.ics
rename to include/icalparser/tests/cal/minimal.ics
diff --git a/icalparser/tests/cal/multiline_description.ics b/include/icalparser/tests/cal/multiline_description.ics
similarity index 100%
rename from icalparser/tests/cal/multiline_description.ics
rename to include/icalparser/tests/cal/multiline_description.ics
diff --git a/icalparser/tests/cal/multiple_attachments.ics b/include/icalparser/tests/cal/multiple_attachments.ics
similarity index 100%
rename from icalparser/tests/cal/multiple_attachments.ics
rename to include/icalparser/tests/cal/multiple_attachments.ics
diff --git a/icalparser/tests/cal/multiple_rrules.ics b/include/icalparser/tests/cal/multiple_rrules.ics
similarity index 100%
rename from icalparser/tests/cal/multiple_rrules.ics
rename to include/icalparser/tests/cal/multiple_rrules.ics
diff --git a/icalparser/tests/cal/parserv2.ics b/include/icalparser/tests/cal/parserv2.ics
similarity index 100%
rename from icalparser/tests/cal/parserv2.ics
rename to include/icalparser/tests/cal/parserv2.ics
diff --git a/icalparser/tests/cal/readme.md b/include/icalparser/tests/cal/readme.md
similarity index 100%
rename from icalparser/tests/cal/readme.md
rename to include/icalparser/tests/cal/readme.md
diff --git a/icalparser/tests/cal/recur_instances.ics b/include/icalparser/tests/cal/recur_instances.ics
similarity index 100%
rename from icalparser/tests/cal/recur_instances.ics
rename to include/icalparser/tests/cal/recur_instances.ics
diff --git a/icalparser/tests/cal/recur_instances_finite.ics b/include/icalparser/tests/cal/recur_instances_finite.ics
similarity index 100%
rename from icalparser/tests/cal/recur_instances_finite.ics
rename to include/icalparser/tests/cal/recur_instances_finite.ics
diff --git a/icalparser/tests/cal/recur_instances_with_modifications.ics b/include/icalparser/tests/cal/recur_instances_with_modifications.ics
similarity index 100%
rename from icalparser/tests/cal/recur_instances_with_modifications.ics
rename to include/icalparser/tests/cal/recur_instances_with_modifications.ics
diff --git a/icalparser/tests/cal/recur_instances_with_modifications_and_interval.ics b/include/icalparser/tests/cal/recur_instances_with_modifications_and_interval.ics
similarity index 100%
rename from icalparser/tests/cal/recur_instances_with_modifications_and_interval.ics
rename to include/icalparser/tests/cal/recur_instances_with_modifications_and_interval.ics
diff --git a/icalparser/tests/cal/recur_instances_with_modifications_to_first_day.ics b/include/icalparser/tests/cal/recur_instances_with_modifications_to_first_day.ics
similarity index 100%
rename from icalparser/tests/cal/recur_instances_with_modifications_to_first_day.ics
rename to include/icalparser/tests/cal/recur_instances_with_modifications_to_first_day.ics
diff --git a/icalparser/tests/cal/utc_negative_zero.ics b/include/icalparser/tests/cal/utc_negative_zero.ics
similarity index 100%
rename from icalparser/tests/cal/utc_negative_zero.ics
rename to include/icalparser/tests/cal/utc_negative_zero.ics
diff --git a/icalparser/tests/cal/weird_windows_timezones.ics b/include/icalparser/tests/cal/weird_windows_timezones.ics
similarity index 100%
rename from icalparser/tests/cal/weird_windows_timezones.ics
rename to include/icalparser/tests/cal/weird_windows_timezones.ics
diff --git a/icalparser/tests/cal/wrong_dates.ics b/include/icalparser/tests/cal/wrong_dates.ics
similarity index 100%
rename from icalparser/tests/cal/wrong_dates.ics
rename to include/icalparser/tests/cal/wrong_dates.ics
diff --git a/icalparser/tests/multiline_description.phpt b/include/icalparser/tests/multiline_description.phpt
similarity index 100%
rename from icalparser/tests/multiline_description.phpt
rename to include/icalparser/tests/multiline_description.phpt
diff --git a/icalparser/tests/multiple_attachments.phpt b/include/icalparser/tests/multiple_attachments.phpt
similarity index 100%
rename from icalparser/tests/multiple_attachments.phpt
rename to include/icalparser/tests/multiple_attachments.phpt
diff --git a/icalparser/tests/recurring_events.phpt b/include/icalparser/tests/recurring_events.phpt
similarity index 100%
rename from icalparser/tests/recurring_events.phpt
rename to include/icalparser/tests/recurring_events.phpt
diff --git a/icalparser/tests/sort_events.phpt b/include/icalparser/tests/sort_events.phpt
similarity index 100%
rename from icalparser/tests/sort_events.phpt
rename to include/icalparser/tests/sort_events.phpt
diff --git a/icalparser/tests/timezone.phpt b/include/icalparser/tests/timezone.phpt
similarity index 100%
rename from icalparser/tests/timezone.phpt
rename to include/icalparser/tests/timezone.phpt
diff --git a/icalparser/tests/wrong_dates.phpt b/include/icalparser/tests/wrong_dates.phpt
similarity index 100%
rename from icalparser/tests/wrong_dates.phpt
rename to include/icalparser/tests/wrong_dates.phpt
diff --git a/icalparser/tools/windowstimezones.php b/include/icalparser/tools/windowstimezones.php
similarity index 100%
rename from icalparser/tools/windowstimezones.php
rename to include/icalparser/tools/windowstimezones.php