diff --git a/etc/install-zerobrane-directly-not-recommended b/etc/install-zerobrane-directly-not-recommended new file mode 100755 index 0000000..aa12446 --- /dev/null +++ b/etc/install-zerobrane-directly-not-recommended @@ -0,0 +1,15 @@ +#!/bin/bash +archive_name=ZeroBraneStudioEduPack-1.70-linux.sh +cd "$HOME" +if [ ! -d "Downloads" ]; then + mkdir Downloads +fi +cd Downloads +if [ ! -f "$archive_name" ]; then + wget -O $archive_name https://download.zerobrane.com/$archive_name +fi +sudo sh "$archive_name" +echo +echo "You can donate to the ZeroBrane Studio project at https://studio.zerobrane.com/support" +echo " (using that URL when linking to ZeroBrane Studio is most courteous to the project)." +echo diff --git a/etc/install-zerobrane-minetest-environment b/etc/install-zerobrane-minetest-environment index 4df96f6..cc6a3ca 100755 --- a/etc/install-zerobrane-minetest-environment +++ b/etc/install-zerobrane-minetest-environment @@ -1,7 +1,8 @@ +#!/bin/bash dls_path="$HOME/Downloads" dl_name="MinetestIDEvers1(dot)0.zip" dl_path="$dls_path/$dl_name" -if [ ! if "" ]; then +if [ ! -f "$dl_path" ]; then echo "ERROR: Nothing done since you must first download $dl_name from" echo " https://forum.minetest.net/viewtopic.php?f=14&t=12923" echo " such that it exists as $dl_path" @@ -21,6 +22,7 @@ if [ -d "$try_path/api" ]; then elif [ ! -d "$share_path" ]; then echo "Neither $share_path nor $try_path was found." echo " Make sure ZeroBrane is installed, or modify share_path in this script." + echo " https://studio.zerobrane.com/support" echo "Press Ctrl C to cancel otherwise this terminal will exit..." echo "3..." sleep 1 diff --git a/etc/minetestserver-install-git-all-backends.sh b/etc/minetestserver-install-git-all-backends.sh index 814f0b2..93193e7 100755 --- a/etc/minetestserver-install-git-all-backends.sh +++ b/etc/minetestserver-install-git-all-backends.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash #this is the recommended script for servers #remove non-git version first: if [ -f "`command -v apt`" ]; then @@ -7,7 +7,7 @@ fi echo "This script compiles AND installs minetestserver (NOT run-in-place, but rather system-wide) with leveldb, redis, and defaults postgresql, doxygen, sqlite3" echo echo -echo "If you want to install the client on your server (not normal practice), change -DBUILD_CLIENT=FALSE to -DBUILD_CLIENT=TRUE before continuing this script." +echo "If you want to install the client on your server (not normal practice), add client or both param when calling this script." echo "Removing the non-git (packaged) version first (Press Ctrl C to cancel)..." sleep 1 echo "3..." @@ -66,8 +66,11 @@ if [ -d minetest ]; then sleep 1 echo "1..." sleep 1 + #cd minetest +else + git clone https://github.com/minetest/minetest.git fi -git clone https://github.com/minetest/minetest.git +#cd minetest git pull --all # see https://forum.minetest.net/viewtopic.php?f=42&t=3837&start=125#p306449 cd minetest/games if [ ! -d minetest_game ]; then diff --git a/etc/minetestserver-uninstall-git-leftovers.sh b/etc/minetestserver-uninstall-git-leftovers.sh index 51d647d..4e7f548 100644 --- a/etc/minetestserver-uninstall-git-leftovers.sh +++ b/etc/minetestserver-uninstall-git-leftovers.sh @@ -1,3 +1,4 @@ +#!/bin/bash if [ ! -f "install_manifest.txt" ]; then echo "missing install_manifest.txt, cannot uninstall unless you properly run cmake source and are running this script from the base repo directory" exit 1 diff --git a/etc/minetestserver-install-git-ENABLE_REDIS b/etc/unused/minetestserver-install-git-ENABLE_REDIS similarity index 98% rename from etc/minetestserver-install-git-ENABLE_REDIS rename to etc/unused/minetestserver-install-git-ENABLE_REDIS index 1e67af1..bce16b4 100644 --- a/etc/minetestserver-install-git-ENABLE_REDIS +++ b/etc/unused/minetestserver-install-git-ENABLE_REDIS @@ -1,3 +1,4 @@ +#!/bin/bash #sudo apt-get install libncurses5-dev libgettextpo-dev doxygen libspatialindex-dev lua-redis-dev gettext sudo apt-get install build-essential cmake git libirrlicht-dev libbz2-dev libgettextpo-dev libfreetype6-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libhiredis-dev libcurl3-dev @@ -17,4 +18,4 @@ sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfre echo -e "\n\n\e[1;33mYou can run Minetest Server by typing \"minetestserver\" in a terminal.\e[0m" echo "Remember to add requirepass to /etc/redis/redis.conf -- a long password since redis is fast and can be bruteforced quickly" # based on https://forum.minetest.net/viewtopic.php?f=42&t=3837 (below) -# sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfreetype6-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libluajit-5.1-dev liblua5.1-0-dev libleveldb-dev; cd; git clone https://github.com/minetest/minetest.git; cd minetest/games; git clone https://github.com/minetest/minetest_game.git; cd ..; cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1; make -j$(nproc); sudo make install; minetest; echo -e "\n\n\e[1;33mYou can run Minetest again by typing \"minetest\" in a terminal or selecting it in an applications menu.\nYou can install mods in ~/.minetest/mods, too.\e[0m" \ No newline at end of file +# sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfreetype6-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libluajit-5.1-dev liblua5.1-0-dev libleveldb-dev; cd; git clone https://github.com/minetest/minetest.git; cd minetest/games; git clone https://github.com/minetest/minetest_game.git; cd ..; cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1; make -j$(nproc); sudo make install; minetest; echo -e "\n\n\e[1;33mYou can run Minetest again by typing \"minetest\" in a terminal or selecting it in an applications menu.\nYou can install mods in ~/.minetest/mods, too.\e[0m"