moved includes and cleaned up paths

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

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