summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürgen Schweizer <oe6jue@oevsv.at>2018-04-03 04:49:59 +0200
committerJürgen Schweizer <oe6jue@oevsv.at>2018-04-03 04:49:59 +0200
commitc0634c0be8452bec507100a610e0c33e9ffaac0e (patch)
tree7376d09235749035c11cb49d2284c1a7951798ee
parentbada1f5013789909c2339b6d1c71caaf3414fe82 (diff)
Revert "no easter meetup"
This reverts commit bada1f5013789909c2339b6d1c71caaf3414fe82.
-rw-r--r--inc/de/meetup.shtml3
-rw-r--r--index.shtml2
-rw-r--r--index.shtml~17
-rwxr-xr-xmeetup/gen_dates_tech.sh58
4 files changed, 2 insertions, 78 deletions
diff --git a/inc/de/meetup.shtml b/inc/de/meetup.shtml
index b84b2bc..882fdda 100644
--- a/inc/de/meetup.shtml
+++ b/inc/de/meetup.shtml
@@ -1,8 +1,7 @@
<div id="meetup">
<h1>Nächstes Treffen</h1>
<p>
- <!--Montag, <em><!--#include virtual="/meetup/next.html" --></em> ab <em>20 Uhr</em><br />
- -->
+ Montag, <em><!--#include virtual="/meetup/next.html" --></em> ab <em>20 Uhr</em><br />
im <a href="https://realraum.at/wiki/doku.php">realraum</a>,
<a href="https://map.project-osrm.org/?dest=47.06555,15.45050&amp;destname=realraum"> Brockmanngasse 15</a>
<br /><br />
diff --git a/index.shtml b/index.shtml
index 6d4ef02..846eb5e 100644
--- a/index.shtml
+++ b/index.shtml
@@ -7,7 +7,7 @@
<!--#include virtual="/inc/${LANG}/meetup.shtml" -->
<p>
Nächstes Tech/Core-Treffen:<br>
- Montag, <em>23.4.2018 20 Uhr</em>
+ Montag, <em>26.3.2018 20 Uhr</em>
</p>
<!--#include virtual="/content/${LANG}/news.html" -->
<!--#else -->
diff --git a/index.shtml~ b/index.shtml~
deleted file mode 100644
index 8c8d595..0000000
--- a/index.shtml~
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--#include virtual="/inc/header.html" -->
-<!--#include virtual="/inc/${LANG}/links.shtml" -->
-<!--#include virtual="/inc/${LANG}/navigation.html" -->
- <div id="content">
-<!--#if expr="${SITE} = index" -->
- <h1>Funkfeuer Graz</h1>
- <!--#include virtual="/inc/${LANG}/meetup.shtml" -->
-<p>
- Nächstes Tech/Core-Treffen:<br>
- Montag, <em>26.2.2018 20 Uhr</em>
-</p>
-<!--#include virtual="/content/${LANG}/news.html" -->
-<!--#else -->
- <!--#include virtual="/content/${LANG}/${SITE}.html" -->
-<!--#endif -->
- </div>
-<!--#include virtual="/inc/footer.shtml" -->
diff --git a/meetup/gen_dates_tech.sh b/meetup/gen_dates_tech.sh
deleted file mode 100755
index 0bc4479..0000000
--- a/meetup/gen_dates_tech.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-# generates the upcoming meetups for Funkfeuer Graz Homepage
-#
-# this script should be called by cron every day (night)
-# how far in the future should i go?
-LIMIT=3
-
-# uncomment to enable debug
-#DEBUG=1
-
-# where to put the output files?
-NEXT_FILE="next.html"
-AFTER_FILE="after.html"
-
-DOW=`date +"%u"`
-if [ $DOW -eq 1 ]; then
- DOM=`date +"%e"`
- TS=`date +"%s"`
-else
- DOM=`date --date="next monday" +"%e"`
- TS=`date --date="next monday" +"%s"`
-fi
-
-MEETUPS=""
-CNT=0
-while true; do
- if [ -n "$DEBUG" ]; then echo -n "check day($TS): "`date --date="@$TS" +"%d.%m.%Y"`; fi
-
- if [ $DOM -le 7 ] || ([ $DOM -ge 15 ] && [ $DOM -le 21 ]); then
- if [ -n "$DEBUG" ]; then echo " -> ok"; fi
- MEETUPS="$MEETUPS $TS"
- CNT=$((CNT + 1))
- if [ $CNT -ge $LIMIT ]; then
- break;
- fi
- else
- if [ -n "$DEBUG" ]; then echo ""; fi
- fi
- TS=$((TS + (7 * 24 * 3600)))
- DOM=`date --date="@$TS" +"%e"`
-done
-
-set -- $MEETUPS
-NEXT=$1
-shift
-FUTURE=$@
-
-date --date="@$NEXT" +"%d.%m.%Y" > "$NEXT_FILE.new"
-echo "<ul>" > "$AFTER_FILE.new"
-for meetup in $FUTURE; do
- echo " <li>"`date --date="@$meetup" +"%d.%m.%Y"`"</li>" >> "$AFTER_FILE.new"
-
-done
-echo "</ul>" >> "$AFTER_FILE.new"
-mv "$NEXT_FILE.new" "$NEXT_FILE"
-mv "$AFTER_FILE.new" "$AFTER_FILE"
-
-exit 0