diff --git a/.gitignore b/.gitignore index 3257414..aa82ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /webapp/linux-minetest-kit-poikilos-patch /webapp/screenshots /webapp/program.log +/webapp/WIP diff --git a/webapp/reset-minetest.sh b/webapp/reset-minetest.sh index a164a24..af8a5e9 100755 --- a/webapp/reset-minetest.sh +++ b/webapp/reset-minetest.sh @@ -1,13 +1,15 @@ -#!/bin/bash -e +#!/bin/bash zip_name=linux-minetest-kit.zip extracted_name=linux-minetest-kit in_use_name=minetest -running=`ps ax | grep -v grep | grep $in_use_name | wc -l` -if [ $running -gt 0 ]; then - echo "killing minetest processes..." - killall $in_use_name -fi -wget -O $zip_name https://downloads.minetest.org/$zip_name || exit 1 +#not reliable with bash -e (if not running, check throws error): +#running=`ps ax | grep -v grep | grep $in_use_name | wc -l` +#if [ $running -gt 0 ]; then +# echo "killing minetest processes..." +# killall $in_use_name +#fi +url=https://downloads.minetest.org +wget -O $zip_name $url/$zip_name || echo "no $zip_name at $url" && exit 1 if [ -d "$extracted_name" ]; then if [ "`ls -lR $extracted_name/minetest/bin/*.png | wc -l`" -gt 0 ]; then if [ ! -d screenshots ]; then mkdir screenshots; fi