From 38af6027ee06f4cd8427e515a3492dd5f060db37 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 31 Oct 2013 12:30:25 +0100 Subject: make-realwallpaper: sep. in_size/xplanet_out_size --- util/bin/make-realwallpaper | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 437919b5..ec7ca538 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -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 @@ -117,11 +118,11 @@ EOF EOF # 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 -- cgit v1.2.3 From 5e3c03f8657f6666e7f71a31a9444e9db2f659d0 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 31 Oct 2013 12:32:39 +0100 Subject: make-realwallpaper: fix indentation --- util/bin/make-realwallpaper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 30bfa2fa..8187c088 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -85,7 +85,7 @@ main() { done # create xplanet output - cat >xplanet.config <xplanet.config <xplanet-sat.config <xplanet-sat.config < Date: Fri, 1 Nov 2013 18:33:12 +0100 Subject: make-realwallpaper fetch sat. data in parallel --- util/bin/make-realwallpaper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 8187c088..6e1abf40 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 -- cgit v1.2.3 From ff0f82e81b075aca030674af6f3b1bee14a644ff Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 1 Nov 2013 18:36:02 +0100 Subject: make-realwallpaper define maps for *.config once --- util/bin/make-realwallpaper | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 6e1abf40..e1e3f5c2 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -84,13 +84,18 @@ main() { ln $normal $final done + map=daymap-final.png + night_map=nightmap-final.png + cloud_map=clouds-final.png + satellite_file=krebs.sat + # create xplanet output cat >xplanet.config <xplanet-sat.config < Date: Fri, 1 Nov 2013 18:48:05 +0100 Subject: make-realwallpaper add gclouds --- util/bin/make-realwallpaper | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index e1e3f5c2..14f6b052 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -84,9 +84,11 @@ main() { ln $normal $final done + make_gcloud_cloudmask + map=daymap-final.png night_map=nightmap-final.png - cloud_map=clouds-final.png + cloud_map=gcloud-cloudmask.png satellite_file=krebs.sat # create xplanet output @@ -143,6 +145,43 @@ EOF && convert xplanet-sat-output.png -crop $out_geometry realwallpaper-sat.png } +# 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) + needs_rebuild gcloud-raw.png $gcloud_tiles && + echo 'make gcloud-raw.png' && + montage -mode Concatenate -background None \ + $gcloud_tiles -tile x16 gcloud-raw.png + + check_type gcloud-raw.png image + + gcloud_in_size=2048x2048 + gcloud_out_size=2048x1024 + gcloud_out_geometry=2048x1024+0+512 + gcloud_base_color='#ffffff' + + needs_rebuild gcloud-normal.png gcloud-raw.png && + echo "make gcloud-normal.png; normalize gcloud-raw.png" >&2 + convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + + needs_rebuild gcloud-cloudmask.png gcloud-normal.png && + echo 'make gcloud-cloudmask.png' && + convert -flatten gcloud-normal.png \ + -fx 'p{i,(asinh(tan((j/h+0.5)*pi))/2.6+0.5)*h}' \ + -crop $gcloud_out_geometry \ + gcloud-cloudmask.png + + needs_rebuild gcloud-fullcloud.png && + echo 'make gcloud-fullcloud.png' && + convert -size $gcloud_out_size xc:$gcloud_base_color gcloud-fullcloud.png +} + # usage: getimg FILENAME URL fetch() { echo "fetch $1" -- cgit v1.2.3 From 6272109f2f4aa54f8971320ba822e2c58e3faf90 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Nov 2013 13:13:40 +0100 Subject: mobile.vvs.de: import from the past --- util/bin/mobile.vvs.de | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100755 util/bin/mobile.vvs.de (limited to 'util/bin') diff --git a/util/bin/mobile.vvs.de b/util/bin/mobile.vvs.de new file mode 100755 index 00000000..b8777e02 --- /dev/null +++ b/util/bin/mobile.vvs.de @@ -0,0 +1,78 @@ +#! /bin/sh +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:]]+(.*)$/'$H:$M' \1/p + /Haltestelle/,/^ *$/{ + /Haltestelle|^ *$/!{ + s/[[:space:]]*\[info\][[:space:]]*$// + p + } + } +' | { + read + echo "$REPLY" + while read time dev no dest ; do + printf "$time %3s → %s\n" $no "$dest" + done +} + +#### -- cgit v1.2.3 From 96cc79111cc32a2268c231475f9795e5dc452a91 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Nov 2013 13:20:18 +0100 Subject: vvs.de: import from the past --- util/bin/vvs.de | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 util/bin/vvs.de (limited to 'util/bin') diff --git a/util/bin/vvs.de b/util/bin/vvs.de new file mode 100755 index 00000000..be9b9f14 --- /dev/null +++ b/util/bin/vvs.de @@ -0,0 +1,35 @@ +#! /bin/sh +set -euf + +#
+ #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 "//,//{ + s.*.*\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 , + +#### -- cgit v1.2.3 From acfa69aed25dcf27fae1550bb9c510f88c8cdd98 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Nov 2013 14:53:41 +0100 Subject: *vvs.de: add some basic documentation --- util/bin/mobile.vvs.de | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ util/bin/vvs.de | 26 +++++++++++++++ 2 files changed, 115 insertions(+) (limited to 'util/bin') diff --git a/util/bin/mobile.vvs.de b/util/bin/mobile.vvs.de index b8777e02..4d50745f 100755 --- a/util/bin/mobile.vvs.de +++ b/util/bin/mobile.vvs.de @@ -1,4 +1,93 @@ #! /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() { diff --git a/util/bin/vvs.de b/util/bin/vvs.de index be9b9f14..718f34ce 100755 --- a/util/bin/vvs.de +++ b/util/bin/vvs.de @@ -1,4 +1,30 @@ #! /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 # -- cgit v1.2.3 From c8e404282348d02d727bc70f58b3b005a0a9d869 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Nov 2013 15:31:15 +0100 Subject: make-realwallpaper: don't die @!needs_rebuild --- util/bin/make-realwallpaper | 83 ++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 38 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 14f6b052..f8081337 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -40,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 @@ -114,17 +116,19 @@ satellite_file=$satellite_file shade=15 EOF - needs_rebuild krebs.sat \ - && cat >krebs.sat <krebs.sat <krebs.mar <krebs.mar <&2 - convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + if needs_rebuild gcloud-normal.png gcloud-raw.png; then + echo "make gcloud-normal.png; normalize gcloud-raw.png" >&2 + convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + fi - needs_rebuild gcloud-cloudmask.png gcloud-normal.png && - echo 'make gcloud-cloudmask.png' && - convert -flatten gcloud-normal.png \ - -fx 'p{i,(asinh(tan((j/h+0.5)*pi))/2.6+0.5)*h}' \ - -crop $gcloud_out_geometry \ - gcloud-cloudmask.png + if needs_rebuild gcloud-cloudmask.png gcloud-normal.png; then + echo 'make gcloud-cloudmask.png' && + convert -flatten gcloud-normal.png \ + -fx 'p{i,(asinh(tan((j/h+0.5)*pi))/2.6+0.5)*h}' \ + -crop $gcloud_out_geometry \ + gcloud-cloudmask.png + fi - needs_rebuild gcloud-fullcloud.png && - echo 'make gcloud-fullcloud.png' && - convert -size $gcloud_out_size xc:$gcloud_base_color gcloud-fullcloud.png + 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 @@ -240,5 +248,4 @@ needs_rebuild() { return $result } - main "$@" -- cgit v1.2.3 From fc7f1e1fd601d11dfef53bc0dd890bbd6f596f6c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Nov 2013 16:24:17 +0100 Subject: make-realwallpaper gcloud now 4x faster --- util/bin/make-realwallpaper | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index f8081337..ba2c6853 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -173,13 +173,20 @@ make_gcloud_cloudmask() { if needs_rebuild gcloud-normal.png gcloud-raw.png; then echo "make gcloud-normal.png; normalize gcloud-raw.png" >&2 - convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + 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 -flatten gcloud-normal.png \ - -fx 'p{i,(asinh(tan((j/h+0.5)*pi))/2.6+0.5)*h}' \ + convert gcloud-normal.png gcloud-distmap \ + -fx 'p{i,v*h}' \ -crop $gcloud_out_geometry \ gcloud-cloudmask.png fi -- cgit v1.2.3 From 8a1ecacac2f3f9475fbde6e165e27bf6e2aca583 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Nov 2013 16:50:16 +0100 Subject: mobile.vvs.de: posix me harder --- util/bin/mobile.vvs.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/bin') diff --git a/util/bin/mobile.vvs.de b/util/bin/mobile.vvs.de index 4d50745f..fdc4cca2 100755 --- a/util/bin/mobile.vvs.de +++ b/util/bin/mobile.vvs.de @@ -157,7 +157,7 @@ itdDate=$Ymd } } ' | { - read + read REPLY echo "$REPLY" while read time dev no dest ; do printf "$time %3s → %s\n" $no "$dest" -- cgit v1.2.3 From 770f0329cd762cbba6b3b24fc37829e9768c6f1f Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 4 Nov 2013 18:11:50 +0100 Subject: vvs.de: talk about hours and minutes --- util/bin/vvs.de | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/bin') diff --git a/util/bin/vvs.de b/util/bin/vvs.de index 718f34ce..3b7ccf93 100755 --- a/util/bin/vvs.de +++ b/util/bin/vvs.de @@ -4,10 +4,10 @@ # vvs.de - web scraper for VVS departure information # # SYNOPSIS -# vvs.de ORIGIN DESTINATION +# vvs.de ORIGIN DESTINATION [HH [MM]] # # EXAMPLES -# $ vvs.de Hauptbahnhof Renningen +# $ vvs.de Hauptbahnhof Renningen 13 37 # # CAVEATS # Acceptable operands have to be found by trial and error. -- cgit v1.2.3 From b48d764d6dcd160a89e391cc88c7e862de39695b Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 5 Nov 2013 18:54:51 +0100 Subject: make-realwallpaper: always write config files --- util/bin/make-realwallpaper | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index ba2c6853..292f203b 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -116,19 +116,15 @@ satellite_file=$satellite_file shade=15 EOF - if needs_rebuild krebs.sat; then - cat >krebs.sat <krebs.sat <krebs.mar <krebs.mar < Date: Tue, 5 Nov 2013 18:56:57 +0100 Subject: make-realwallpaper: removed ATV-4 from sats --- util/bin/make-realwallpaper | 1 - 1 file changed, 1 deletion(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 292f203b..d2ad81aa 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -119,7 +119,6 @@ EOF cat >krebs.sat < Date: Tue, 5 Nov 2013 19:09:01 +0100 Subject: make-realwallpaper: both default and normal vers --- util/bin/make-realwallpaper | 60 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 5 deletions(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index d2ad81aa..84283bb1 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -90,7 +90,8 @@ main() { map=daymap-final.png night_map=nightmap-final.png - cloud_map=gcloud-cloudmask.png + cloud_map=clouds-final.png + gcloud_map=gcloud-cloudmask.png satellite_file=krebs.sat # create xplanet output @@ -114,6 +115,29 @@ cloud_map=$cloud_map cloud_threshold=10 satellite_file=$satellite_file shade=15 +EOF + + # create xplanet output gcloud version + cat >xplanet-gcloud.config <xplanet-gcloud-sat.config <krebs.sat < Date: Tue, 5 Nov 2013 19:21:07 +0100 Subject: make-realwallpaper fixed gcloud-distmap --- util/bin/make-realwallpaper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/bin') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 84283bb1..837bd378 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -230,7 +230,7 @@ make_gcloud_cloudmask() { if needs_rebuild gcloud-cloudmask.png gcloud-normal.png; then echo 'make gcloud-cloudmask.png' && - convert gcloud-normal.png gcloud-distmap \ + convert gcloud-normal.png gcloud-distmap.png \ -fx 'p{i,v*h}' \ -crop $gcloud_out_geometry \ gcloud-cloudmask.png -- cgit v1.2.3