diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | cholerab/tahoe/brick_installation | 31 | ||||
| -rw-r--r-- | util/archlive/archlive.tar | bin | 0 -> 58785 bytes | |||
| -rw-r--r-- | util/archlive/readme | 7 | ||||
| -rwxr-xr-x | util/bin/make-realwallpaper | 129 | ||||
| -rwxr-xr-x | util/bin/mobile.vvs.de | 167 | ||||
| -rwxr-xr-x | util/bin/vvs.de | 61 | ||||
| -rwxr-xr-x | util/t/mobile.vvs.de/smoke-test | 5 | ||||
| -rwxr-xr-x | util/t/vvs.de/smoke-test | 11 |
9 files changed, 373 insertions, 39 deletions
diff --git a/.travis.yml b/.travis.yml index c333578b..677024b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ script: "! ( make -C util test | grep -q '^not ok' )" before_install: - sudo apt-get install bc -qq - sudo apt-get install python -qq + - sudo apt-get install w3m -qq branches: only: - master diff --git a/cholerab/tahoe/brick_installation b/cholerab/tahoe/brick_installation index b319393b..79748623 100644 --- a/cholerab/tahoe/brick_installation +++ b/cholerab/tahoe/brick_installation @@ -1,18 +1,41 @@ -#?/bin/sh -# Tahoe installation +#? /bin/sh + +## Tahoe Brick Installation (Arch Linux) pacman -S python2 python2-pip net-tools pip2 install pyasn1 zfec pycrypto zbase32 pycryptopp twisted pip2 install allmydata-tahoe -# tahoe configuration +## Tahoe Brick Installation (Arch Linux / Expert Mode^_^) +# if the above breaks for some reason, but you basically know what you're +# doing, then you could try something like this: +pip2 uninstall `pip2 list | awk '{print$1}'` +yaourt -S --asdeps --noconfirm net-tools python2 python2-zope-interface \ + twisted python2-pyasn1 python2-crypto pycryptopp nevow python2-foolscap \ + python2-simplejson zfec python2-pyopenssl pyutil python2-argparse zbase32 \ + python2-mock python2-setuptools +yaourt -S --noconfirm tahoe-lafs + +## Tahoe Brick Configuration mkdir /opt/tahoe tahoe create-node /opt/tahoe useradd tahoe -d /opt/tahoe +chown -R tahoe: /opt/tahoe + # change nick name +(echo -n "nick name [$HOSTNAME]: " && + read nn && + sed -i "s/^nickname =.*/nickname = ${nn:-$HOSTNAME}/" /opt/tahoe/tahoe.cfg) + # replace introducer.furl = None with the one from pigstarter/tahoe/introducer.furl sed -i "s#^introducer\.furl.*#introducer.furl = $(curl pigstarter/tahoe/introducer.furl)#" /opt/tahoe/tahoe.cfg + # you also might want to change shares.needed to 2 , shares.happy to 3 and shares.total to 6 -# +sed -i 's/#shares\.needed = 3/shares.needed = 2/' /opt/tahoe/tahoe.cfg +sed -i 's/#shares\.happy = 7/shares.happy = 3/' /opt/tahoe/tahoe.cfg +sed -i 's/#shares\.total = 10/shares.happy = 6/' /opt/tahoe/tahoe.cfg + # optionally symlink /opt/tahoe/storage to somewhere with a lot of storage cp tahoe.service /usr/lib/systemd/system/tahoe.service + systemctl enable tahoe.service +systemctl start tahoe.service diff --git a/util/archlive/archlive.tar b/util/archlive/archlive.tar Binary files differnew file mode 100644 index 00000000..13878e24 --- /dev/null +++ b/util/archlive/archlive.tar diff --git a/util/archlive/readme b/util/archlive/readme new file mode 100644 index 00000000..bb23a942 --- /dev/null +++ b/util/archlive/readme @@ -0,0 +1,7 @@ +change key in root-image/root/.ssh/authorized_keys +change target hidden service in root-image/etc/systemd/scripts/nc_onion + +run build.sh (as root) + +archlive will send the hidden service every minute to configured targets hidden service +stop with systemctl stop krebs-init diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index a195b5f1..ba2c6853 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -16,7 +16,7 @@ main() { fetch clouds-raw.jpg \ http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg & fetch krebs.sat.tle \ - http://www.celestrak.com/NORAD/elements/stations.txt + http://www.celestrak.com/NORAD/elements/stations.txt & wait #check_type nightmap-old-raw.jpg image @@ -24,7 +24,8 @@ main() { check_type daymap-raw.png image check_type clouds-raw.jpg image - in_size=1466x1200 + in_size=2048x1024 + xplanet_out_size=1466x1200 out_geometry=1366x768+100+160 nightsnow_color='#0c1a49' # nightmap @@ -39,24 +40,26 @@ main() { ; do normal=${raw%-raw.*}.png - needs_rebuild $normal $raw || continue - echo "make $normal; normalize $raw" >&2 - convert $raw -scale $in_size $normal + if needs_rebuild $normal $raw; then + echo "make $normal; normalize $raw" >&2 + convert $raw -scale $in_size $normal + fi done # create nightmap-fullsnow - needs_rebuild nightmap-fullsnow.png \ - && convert -size $in_size xc:$nightsnow_color nightmap-fullsnow.png + if needs_rebuild nightmap-fullsnow.png; then + convert -size $in_size xc:$nightsnow_color nightmap-fullsnow.png + fi # extract daymap-snowmask from daymap-final - needs_rebuild daymap-snowmask.png \ - daymap.png \ - && convert daymap.png -threshold 95% daymap-snowmask.png + if needs_rebuild daymap-snowmask.png daymap.png; then + convert daymap.png -threshold 95% daymap-snowmask.png + fi # extract nightmap-lightmask from nightmap - needs_rebuild nightmap-lightmask.png \ - nightmap.png \ - && convert nightmap.png -threshold 25% nightmap-lightmask.png + if needs_rebuild nightmap-lightmask.png nightmap.png; then + convert nightmap.png -threshold 25% nightmap-lightmask.png + fi # create layers make_layer nightmap-snowlayer.png nightmap-fullsnow.png daymap-snowmask.png @@ -83,58 +86,115 @@ main() { ln $normal $final done + make_gcloud_cloudmask + + map=daymap-final.png + night_map=nightmap-final.png + cloud_map=gcloud-cloudmask.png + satellite_file=krebs.sat + # create xplanet output - cat >xplanet.config <<EOF + cat >xplanet.config <<EOF [earth] "Earth" -map=daymap-final.png -night_map=nightmap-final.png -cloud_map=clouds-final.png +map=$map +night_map=$night_map +cloud_map=$cloud_map cloud_threshold=10 shade=15 EOF # create xplanet output satellite version - cat >xplanet-sat.config <<EOF + cat >xplanet-sat.config <<EOF [earth] "Earth" -map=daymap-final.png -night_map=nightmap-final.png -cloud_map=clouds-final.png -satellite_file=krebs.sat +map=$map +night_map=$night_map +cloud_map=$cloud_map cloud_threshold=10 +satellite_file=$satellite_file shade=15 EOF - needs_rebuild krebs.sat \ - && cat >krebs.sat <<EOF + if needs_rebuild krebs.sat; then + cat >krebs.sat <<EOF 25544 "ISS" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 37820 "T1" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 39175 "ATV-4" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 39258 "CYG" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 EOF + fi - needs_rebuild krebs.mar \ - && cat >krebs.mar <<EOF + if needs_rebuild krebs.mar; then + cat >krebs.mar <<EOF EOF + fi # rebuild every time to update shadow - xplanet --num_times 1 --geometry $in_size \ + xplanet --num_times 1 --geometry $xplanet_out_size \ --output xplanet-output.png --projection merc -config xplanet.config # rebuild everytime satellite version - xplanet --num_times 1 --geometry $in_size \ + xplanet --num_times 1 --geometry $xplanet_out_size \ --output xplanet-sat-output.png --projection merc -config xplanet-sat.config # trim xplanet output - needs_rebuild realwallpaper.png \ - xplanet-output.png \ - && convert xplanet-output.png -crop $out_geometry realwallpaper.png + if needs_rebuild realwallpaper.png xplanet-output.png; then + convert xplanet-output.png -crop $out_geometry realwallpaper.png + fi # trim xplanet-sat output - needs_rebuild realwallpaper-sat.png \ - xplanet-sat-output.png \ - && convert xplanet-sat-output.png -crop $out_geometry realwallpaper-sat.png + if needs_rebuild realwallpaper-sat.png xplanet-sat-output.png; then + convert xplanet-sat-output.png -crop $out_geometry realwallpaper-sat.png + fi +} + +# generate clouds from google maps +make_gcloud_cloudmask() { + echo 'fetch gcloud-*.png tiles' >&2 + for y in $(seq -w 0 15); do + for x in $(seq -w 0 15); do + echo "curl -sS -o gcloud-$y-$x.png -z gcloud-$y-$x.png \\\"https://mts0.google.com/vt/lyrs=h@239000000,weather_nolabels,weather_0cloud&hl=en&src=app&x=$x&y=$y&z=4&s=Galil\\\"" + done + done | xargs --max-args=1 -P 10 -I @ sh -c @ + gcloud_tiles=$(find -name 'gcloud-[0-9][0-9]-[0-9][0-9].png'|sort) + if needs_rebuild gcloud-raw.png $gcloud_tiles; then + echo 'make gcloud-raw.png' && + montage -mode Concatenate -background None \ + $gcloud_tiles -tile x16 gcloud-raw.png + fi + + check_type gcloud-raw.png image + + gcloud_in_size=2048x2048 + gcloud_out_size=2048x1024 + gcloud_out_geometry=2048x1024+0+512 + gcloud_base_color='#ffffff' + + if needs_rebuild gcloud-normal.png gcloud-raw.png; then + echo "make gcloud-normal.png; normalize gcloud-raw.png" >&2 + convert -flatten gcloud-raw.png \ + -scale $gcloud_in_size gcloud-normal.png + fi + + if needs_rebuild gcloud-distmap.png; then + convert -size 2048x2048 gradient: -rotate 180 \ + -fx "p{i, (asinh(tan((j/h+0.5)*pi))/2.6+0.5) * h }" \ + gcloud-distmap.png + fi + + if needs_rebuild gcloud-cloudmask.png gcloud-normal.png; then + echo 'make gcloud-cloudmask.png' && + convert gcloud-normal.png gcloud-distmap \ + -fx 'p{i,v*h}' \ + -crop $gcloud_out_geometry \ + gcloud-cloudmask.png + fi + + if needs_rebuild gcloud-fullcloud.png; then + echo 'make gcloud-fullcloud.png' && + convert -size $gcloud_out_size xc:$gcloud_base_color gcloud-fullcloud.png + fi } # usage: getimg FILENAME URL @@ -195,5 +255,4 @@ needs_rebuild() { return $result } - main "$@" diff --git a/util/bin/mobile.vvs.de b/util/bin/mobile.vvs.de new file mode 100755 index 00000000..fdc4cca2 --- /dev/null +++ b/util/bin/mobile.vvs.de @@ -0,0 +1,167 @@ +#! /bin/sh +# +# NAME +# mobile.vvs.de - web scraper for VVS departure information +# +# SYNOPSIS +# mobile.vvs.de ORIGIN [HH [MM [YYmmdd]]] +# +# DESCRIPTION +# The mobile.vvs.de utility fetches departure information from the +# Internet and prints the results to standard output. +# +# OPERANDS +# ORIGIN The point of departure. +# +# HH, MM, YYmmdd +# The time and date of departure. Defaults to the current +# time and date. +# +# STDIN +# Not used. +# +# INPUT FILES +# None. +# +# ENVIRONMENT VARIABLES +# The following environment variables affect the execution of mobile.vvs.de: +# +# limit Limits the number of entries to be fetched. +# +# origin, H, M, Ymd +# Provide defaults operands. If origin is set, then ORIGIN +# becomes optional. The order of the operands doesn't change +# by these variables. These variables are overridden by the +# operands. +# +# ASYNCHRONOUS EVENTS +# Defaults. +# +# STDOUT +# The first line has the format: +# +# "\e[4m%s:%s %s\e[m\n", H, M, origin_real_name +# +# where H and M are the corresponding provided or default operands. +# origin_real_name is the real name of the point of departure. +# +# The subsequent lines specify the departing means of transport. +# Each line has the format: +# +# "%s %s → %s\n", time_of_departure, line_number, destination +# +# where time_of_departure is self-evident, and line_number and +# destination identify the route and direction. +# +# STDERR +# Not used. +# +# OUTPUT FILES +# None. +# +# EXTENDED DESCRIPTION +# None. +# +# EXIT STATUS +# 0 A departure board could be fetched. +# +# 1 ORIGIN doesn't specify an acceptable point of departure. +# +# EXAMPLES +# 1. Get the top three current departures at Stuttgart, Hauptbahnhof: +# +# $ limit=3 mobile.vvs.de hauptbahnhof +# +# FUTURE DIRECTIONS +# None. +# +# BUGS +# The format of STDOUT suffers from bit rot. +# +# SEE ALSO +# vvs.de +# +# COPYRIGHT +# All departure information is copyrighted by Verkehrs- und +# Tarifverbund Stuttgart GmbH. The original copyright statement can +# be obtained online at http://www.vvs.de/impressum . +# +# The following code is your fault. +# +set -euf + +ltrim() { + sed "s/^[${1-$symbols}]*//" +} + +POST() { + ## TODO url-encode, trim + tr '\n' '&' | sed 's/&$//' | + w3m -config /dev/null -cols 256 -post /dev/stdin -dump "${1-$URI}" +} + +limit=${limit-10} +origin="${1-$origin}" +H="${2-${H-`date +%H`}}" +M="${3-${M-`date +%M`}}" +Ymd="${4-${Ymd-`date +%Y%m%d`}}" + +URI='http://mobil.vvs.de/mobile/XSLT_DM_REQUEST' + +echo " +sessionID=0 +requestID=0 +language=de +locationServerActive=1 +useRealtime=1 +anySigWhenPerfectNoOtherMatches=1 +limit=$limit +deleteAssignedStops_dm=1 +mode=direct +convertCrossingsITKernel2LocationServer=1 +convertStopsPTKernel2LocationServer=1 +convertAddressesITKernel2LocationServer=1 +convertPOIsITKernel2LocationServer=1 +itdLPxx_dest= +useAllStops=1 +maxAssignedStops=1 +itOptionsActive=1 +trITMOTvalue100=5 +ptOptionsActive=1 +useProxFootSearch=0 +w_regPrefAm=1 +w_objPrefAl=2 +w_objPrefAl=12 +itdLPxx_script=true +place_dm= +placeState_dm=empty +nameState_dm=empty +nameInfo_dm=invalid +typeInfo_dm=invalid +placeInfo_dm=invalid +reducedAnyWithoutAddressObjFilter_dm=103 +reducedAnyPostcodeObjFilter_dm=64 +reducedAnyTooManyObjFilter_dm=2 +anyObjFilter_dm=126 +type_dm=any +name_dm=$origin +itdTimeHour=`echo $H | ltrim 0` +itdTimeMinute=`echo $M | ltrim 0` +itdDate=$Ymd +" | POST "$URI" | sed -rn ' + s/^Von:[^[:alpha:]]+(.*)$/[4m'$H:$M' \1[m/p + /Haltestelle/,/^ *$/{ + /Haltestelle|^ *$/!{ + s/[[:space:]]*\[info\][[:space:]]*$// + p + } + } +' | { + read REPLY + echo "$REPLY" + while read time dev no dest ; do + printf "$time %3s → %s\n" $no "$dest" + done +} + +#### diff --git a/util/bin/vvs.de b/util/bin/vvs.de new file mode 100755 index 00000000..718f34ce --- /dev/null +++ b/util/bin/vvs.de @@ -0,0 +1,61 @@ +#! /bin/sh +# +# NAME +# vvs.de - web scraper for VVS departure information +# +# SYNOPSIS +# vvs.de ORIGIN DESTINATION +# +# EXAMPLES +# $ vvs.de Hauptbahnhof Renningen +# +# CAVEATS +# Acceptable operands have to be found by trial and error. +# +# BUGS +# Probably bit rot.^_^ +# +# SEE ALSO +# mobile.vvs.de +# +# COPYRIGHT +# All departure information is copyrighted by Verkehrs- und +# Tarifverbund Stuttgart GmbH. The original copyright statement can +# be obtained online at http://www.vvs.de/impressum . +# +# The following code is your fault. +# +set -euf + +# <form action="./efaanyfield/anyfield.php" method="post" id="efaForm">
+ #s/itdDateDay=/&${3-$itdDateDay}/ + #s/itdDateMonth=/&${4-$itdDateMonth}/ + #s/itdDateYear=/&${5-$itdDateYear}/ + +vvs_tmp=/tmp/vvs.tmp +curl -Ss http://www.vvs.de/fahrplan/ | +sed -rn "/<!-- EFA -->/,/<!-- \/EFA -->/{ + s.*<input.*name=\"([^\"]*)\".*value=\"([^\"]*)\".*/>.*\1=\2;T + /itdTripDateTimeDepArr=arr/b + s/(name_origin=).*/\1${1-$name_origin}/ + s/(name_destination=).*/\1${2-$name_destination}/ + ${3+s/(itdTimeHour=).*/\1${3-$itdTimeHour}/} + ${4+s/(itdTimeMinute=).*/\1${4-$itdTimeMinute}/} + p +}" | tr '\n' '&' | sed 's/&$//' >"$vvs_tmp" + + +#while read line ; do +# test -z "$line" || echo "$line" +#done >"$vvs_tmp" + +echo from: ${1-$name_origin} +echo \ \ to: ${2-$name_destination} +echo '-------------------------------------' +w3m -cols 9423 -post "$vvs_tmp" \ + -dump http://www.vvs.de/./efaanyfield/anyfield.php | +sed -rn " + s/^ +[0-9]+ +([0-9]+:[0-9]+) +([0-9]+:[0-9]+) +([A-Z0-9 ,]+) .*$/\1 \2 \3/p +" | tr -d , + +#### diff --git a/util/t/mobile.vvs.de/smoke-test b/util/t/mobile.vvs.de/smoke-test new file mode 100755 index 00000000..0b9e7960 --- /dev/null +++ b/util/t/mobile.vvs.de/smoke-test @@ -0,0 +1,5 @@ +#! /bin/sh +set -euf +mobile.vvs.de hauptbahnhof | + sed -n 'p;q' | + grep -q '\[4m[0-9][0-9]:[0-9][0-9] Stuttgart, Hauptbahnhof\[m' diff --git a/util/t/vvs.de/smoke-test b/util/t/vvs.de/smoke-test new file mode 100755 index 00000000..451270fe --- /dev/null +++ b/util/t/vvs.de/smoke-test @@ -0,0 +1,11 @@ +#! /bin/sh +set -euf + +vvs.de Hauptbahnhof Renningen 13 37 | { + read from && test "x$from" = 'xfrom: Hauptbahnhof' + read to && test "x$to" = 'xto: Renningen' + read sep && test "x$sep" = 'x-------------------------------------' + while read line; do + echo "$line" | grep -q '^[0-9][0-9]:[0-9][0-9] [0-9][0-9]:[0-9][0-9] ' + done +} |