From 7a93278985dbbcf687045e19749854ceaf98df6b Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Wed, 24 Feb 2016 12:47:31 -0500 Subject: [PATCH] rename example page to avoid hyphen vs underscore confusion --- README.md | 6 +++--- install-chunkymap-on-ubuntu.sh | 2 +- update-chunkymap-on-ubuntu-from-web.sh | 7 ++++--- web/{index-example.php => example.php} | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) rename web/{index-example.php => example.php} (99%) diff --git a/README.md b/README.md index ca03d4d..71a7ebf 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,11 @@ This program comes without any warranty, to the extent permitted by applicable l (if you are not using /var/www/html/minetest/chunkymapdata, edit chunkymap-cronjob script to use the correct folder, then) `chmod +x set-minutely-crontab-job.sh && ./set-minutely-crontab-job.sh` * IF you are using Linux - * Either copy your code to index-example.php and use it, or just rename it to map.php (or anything you want) then link to it. + * Either copy your code to example.php and use it, or just rename it to map.php (or anything you want) then link to it. # The commands below will work if you are using the web installer, or have done mv minetest-chunkymap-master "$HOME/Downloads/minetest-chunkymap" (and if you are using /var/www/html/minetest -- otherwise change that) MT_MY_WEBSITE_PATH=/var/www/html/minetest sudo cp -f "$HOME/Downloads/minetest-chunkymap/web/chunkymap.php" "$MT_MY_WEBSITE_PATH/chunkymap.php" - sudo cp --no-clobber "$HOME/Downloads/minetest-chunkymap/web/index_example.php" "$MT_MY_WEBSITE_PATH/viewchunkymap.php" + sudo cp --no-clobber "$HOME/Downloads/minetest-chunkymap/web/example.php" "$MT_MY_WEBSITE_PATH/viewchunkymap.php" sudo cp -R --no-clobber "$HOME/Downloads/minetest-chunkymap/web/images/*" "$MT_MY_WEBSITE_PATH/images/" #--no-clobber: do not overwrite existing # after you do this, the update script will do it for you if you are using /var/www/html/minetest, otherwise edit the update script before using it to get these things updated @@ -70,7 +70,7 @@ This program comes without any warranty, to the extent permitted by applicable l * edit chunkymap_regen.py and change world_name to your world name ## Known Issues -* index-example.php should read the size of the chunks -- see near is_file($chunk_genresult_path) in chunkymap.php +* chunkymap.php should read the size of the chunks -- see near is_file($chunk_genresult_path) in chunkymap.php * optionally hide player location * Make a method (in chunkymap.php) to echo the map as an html5 canvas (refresh players every 10 seconds, check for new map chunks every minute) * Detect failure of minetestmapper-numpy.py and instead use minetest-mapper if on linux, otherwise show error if neither are present (Windows has no minetest-mapper at least on client 0.4.13) diff --git a/install-chunkymap-on-ubuntu.sh b/install-chunkymap-on-ubuntu.sh index c978117..85d2ba8 100644 --- a/install-chunkymap-on-ubuntu.sh +++ b/install-chunkymap-on-ubuntu.sh @@ -35,4 +35,4 @@ echo "" echo "To learn about chunkymap:" echo "cd $CHUNKYMAP_DEST" echo "" -# NOTE: colors.txt should ALREADY be in $HOME/minetest/util \ No newline at end of file +# NOTE: colors.txt should ALREADY be in $HOME/minetest/util diff --git a/update-chunkymap-on-ubuntu-from-web.sh b/update-chunkymap-on-ubuntu-from-web.sh index 312f5c8..64c2355 100644 --- a/update-chunkymap-on-ubuntu-from-web.sh +++ b/update-chunkymap-on-ubuntu-from-web.sh @@ -19,9 +19,10 @@ MT_MY_WEBSITE_PATH=/var/www/html/minetest if [ -f "$HOME/Downloads/minetest-chunkymap/web/chunkymap.php" ]; then if [ -f "$MT_MY_WEBSITE_PATH/chunkymap.php" ]; then - sudo cp -f "$HOME/Downloads/minetest-chunkymap/web/chunkymap.php" "$MT_MY_WEBSITE_PATH/chunkymap.php" - sudo cp --no-clobber "$HOME/Downloads/minetest-chunkymap/web/index_example.php" "$MT_MY_WEBSITE_PATH/viewchunkymap.php" - sudo cp -R --no-clobber "$HOME/Downloads/minetest-chunkymap/web/images/*" "$MT_MY_WEBSITE_PATH/images/" + sudo cp -f "$HOME/Downloads/minetest-chunkymap/web/chunkymap.php" "$MT_MY_WEBSITE_PATH/" + sudo cp --no-clobber "$HOME/Downloads/minetest-chunkymap/web/example.php" "$MT_MY_WEBSITE_PATH/viewchunkymap.php" + # cannot put wildcard in quotes on unix + sudo cp -R --no-clobber $HOME/Downloads/minetest-chunkymap/web/images/* "$MT_MY_WEBSITE_PATH/images/" #--no-clobber: do not overwrite existing fi fi diff --git a/web/index-example.php b/web/example.php similarity index 99% rename from web/index-example.php rename to web/example.php index 3c94447..966d75e 100644 --- a/web/index-example.php +++ b/web/example.php @@ -36,4 +36,4 @@ else { ?>
Powered by Chunkymap
- \ No newline at end of file +