From 641fb9b70441cbc1d31f5b28b5ce410d1c8aeb5a Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Sun, 18 Feb 2018 20:03:57 -0500 Subject: [PATCH] switch to modernized mods --- README.md | 111 +++++------ etc/game-install-ENLIVEN | 257 ++++++++++++++----------- etc/game-install-enliven-testing.sh | 285 ---------------------------- etc/minetestserver-uninstall-git.sh | 4 +- 4 files changed, 201 insertions(+), 456 deletions(-) delete mode 100644 etc/game-install-enliven-testing.sh diff --git a/README.md b/README.md index c294188..2adb3e0 100644 --- a/README.md +++ b/README.md @@ -10,40 +10,25 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less * birthstones, improved fork: ### Planned Features +* maintain a table of short descriptions of mods * see also EnlivenMinetest/etc/game-install-enliven-testing.sh -* slimenodes fork with buckets and recipes (craft from glue or animal hide) -* https://github.com/minetest-mods/sounding_line (machine block that measures depth of water under it) +* slimenodes fork: make glue replaceable with animal hide * https://github.com/minetest-mods/tutor -* https://github.com/minetest-mods/lightning * https://github.com/minetest-mods/chat_anticurse -* https://github.com/minetest-mods/cozy (sitting and laying down player animations)--compare with emote -* https://github.com/minetest-mods/mywalls (more wall styles; brick & stone brick walls) -* https://github.com/minetest-mods/mymasonhammer (cut stairs & ladders in blocks) +* https://github.com/minetest-mods/cozy (sitting and laying down player animations)--compare with emote https://github.com/minetest-mods/emote.git #### Possible Additions -* SWITCH testing mod for furniture to minetest-mods version: - https://github.com/minetest-mods/ts_furniture -* SWITCH to https://github.com/minetest-mods/inspector (from metatools mod) +* make a ruins mod that generates ruins with: statues, mese, stone with chipped paint or paintings, tan shale blocks with and without engravings +* SWITCH to https://github.com/minetest-mods/inspector (instead of metatools mod) https://github.com/minetest-mods/inspector * SWITCH to frame: "non-laggy item frame"--& make mod to alias-out the existing (homedecor?) ones in ENLIVEN https://github.com/minetest-mods/frame * SWITCH to mob-engine (based on cme) by minetest-mods team https://github.com/minetest-mods/mob-engine https://forum.minetest.net/viewtopic.php?t=17106 -* SWITCH from GunshipPenguin's sprint to minetest-mods' hbsprint (which optionally uses hudbars, hbhunger, and player_monoids) - https://github.com/minetest-mods/hbsprint.git -* SWITCH from tsm_chests_dungeon to loot or dungeon_loot (loot is maintained by minetest-mods; tsm generates treasure from trm treasure lists using treasurer) - https://github.com/minetest-mods/loot.git - settings: - * loot_vaults - Set to true to enable loot vault generation. - * loot_dungeons - Set to true to enable loot generation in dungeons. -* SWITCH from farming redo to minetest-mods crops - (works with farming from minetest_game) - "pumpkins, melons and potatoes are obtainable. The rest currently isn't." -sofar - so probably a trm_crops mod should be created * timer: "A persistent timer class that can be restarted after server shutdown" https://github.com/minetest-mods/timer -* add but remove fire (flint and steel)? +* add modpack but remove fire items (flint and steel?) from: https://github.com/xisd/trmp_Pack.git * https://github.com/minetest-mods/woodcutting/archive/master.zip (sneek click to start auto-harvest tree, sneak again to cancel) @@ -59,19 +44,15 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less https://forum.minetest.net/viewtopic.php?f=11&t=1882 * worldedge: wrap world as if it is a sphere https://github.com/minetest-mods/worldedge -* stamina: hunger-based stamina - https://github.com/minetest-mods/stamina * myroofs: sloped roofs in red, green, and dark gray--compare with existing (homedecor?) roofs in ENLIVEN https://github.com/minetest-mods/myroofs * https://github.com/minetest-mods/BobBlocks (light poles and settable damaging traps) * https://github.com/xisd/trmp_Pack (but only the mods from it mods matching ENLIVEN mods) (NOT the same as [trm_pack by Wuzzy](https://forum.minetest.net/viewtopic.php?pid=113052#p113052), which has mostly stuff from weird mods or stuff already in trmp_minetest_game) -* mg: has villages, and is now maintained by minetest-mods - https://github.com/minetest-mods/mg.git -* emote: - https://github.com/minetest-mods/emote.git -* vote: - https://github.com/minetest-mods/vote.git +* weather: https://github.com/Jeija/minetest-mod-weather ( https://forum.minetest.net/viewtopic.php?t=5245 ) +* baked clay (Ethereal NG integrates with it, mobs redo, and farming redo) +* Updated pipeworks fork by HybridDog: https://github.com/HybridDog/pipeworks + ##### low-pri * drawers: https://github.com/minetest-mods/drawers.git @@ -86,6 +67,9 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less * diet, but maybe add hunger monoid when simple carbs are eaten & make hunger monoid cumulatively reduce satiation (instead of using diet): https://github.com/minetest-mods/diet.git * make new decor nodes (in order of priority first): corner closed and/or open curtains (for curtains on each window both touching corner) electric range, couch +* possibly replace Immersive Sounds [ambience]: https://forum.minetest.net/viewtopic.php?t=2807 + with technic_ambience: http://realbadangel.pl/technic_ambience.zip +* dungeon_loot (but "loot" mod should already cover that with default settings) #### Root Script Deprecation Process ##### Goals @@ -145,11 +129,35 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn * The included minetest.conf recommended for your clients includes the line enable_local_map_saving = true, which will cache the world locally on their machines. You can feel free to change that according to your preference. ## Changes: -(2018-02-15) +### (2018-02-18) +* switched to FaceDeer's fork of caverealms which is integrated with mapgen v7's perlin noise and therefore with its biomes +* added: + * lightning + * mywalls (more wall styles; brick & stone brick walls) + * mymasonhammer (cut stairs & ladders in blocks) + * sounding_line (machine block that measures depth of water under it) +* switched from spawners to Wuzzy's tsm_pyramids and minetest-mods' loot (was already using trm_pyramids anyway which didn't seem to work with spawners' pyramids) +* add https://github.com/minetest-mods/ts_furniture +* add vote +* add stamina: hunger-based stamina https://github.com/minetest-mods/stamina +* SWITCH from tsm_chests_dungeon to loot (loot is maintained by minetest-mods; tsm generates treasure from trm treasure lists using treasurer) + https://github.com/minetest-mods/loot.git + settings (for world.mt): + * loot_vaults - Set to true to enable loot vault generation (default false) + * loot_dungeons - Set to true to enable loot generation in dungeons (default true) +* SWITCH from farming redo to minetest-mods crops + (works with farming from minetest_game) + "pumpkins, melons and potatoes are obtainable. The rest currently isn't." -sofar + so probably a trm_crops mod should be created +### (2018-02-17) +* switched to minetest-mods hbsprint (which optionally uses hudbars, hbhunger, and player_monoids) https://github.com/minetest-mods/hbsprint.git + * removed all other huds and hud mods until compatibility can be determined (they were causing health and food system to not work at all) + * formerly used GunshipPenguin's sprint +### (2018-02-15) * moved mappers to -(2018-02-07) +### (2018-02-07) * forked trm_minetest_game to use proper dye list (submitted pull request to ClockGen since his is the only known git version of Wuzzy's which was on the [official treasurer thread](https://forum.minetest.net/viewtopic.php?t=7292)) -(2018-02-08) +### (2018-02-08) * trm_pyramids added (partial code in game-install-ENLIVEN completed) (a required treasure table so tsm_pyramids can provide treasure in pyramids) * switched links to use minetest-mods' versions of: @@ -162,9 +170,7 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn * added anvil mod * added sling mod: (throw any item or stack using sling--accounts for multiplayer) * added tsm_chests_dungeon mod (adds chests to the default dungeons) -- https://forum.minetest.net/viewtopic.php?f=9&t=17005 - - -(2018-02-06) +### (2018-02-06) * refactored file structure * renamed games/ENLIVEN to patches/subgame * moved etc/Mods* to patches/mods* @@ -172,31 +178,31 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn * added * moved nyancat to patches/subgame/minetest_game-deprecated-mods-list.txt (wiki.minetest.net/Nyan_Cat says if you want it back, copy it from 0.4.15) -(2018-02-03) +### (2018-02-03) * bump Python requirement to 3 (no more testing is planned to be done on python2) and use python3 binary when calling py files from scripts * (chunkymap-generator.bat, pythoninfo.py) if using Windows, check for various versions of Python3 and warn if fails (no longer check for Python2) * (minetestinfo.py) account for Minetest 0.4.16 arch naming difference: minetest_game (from minetest-data package) becomes minetest (still check for minetest_game if minetest not present in minetest/games since 0.4.16 repack 3 via deb from Debian via Ubuntu still uses the folder name minetest_game) -(2017-05-25) +### (2017-05-25) * switched to expertmm fork of travelnet -(2017-05-18) +### (2017-05-18) * Installer now available at [axlemedia.net](http://www.axlemedia.net/index.php?htmlref=tutoring.html "Axle Media") -- added project and related files for Inno Setup Compiler. -(2017-05-15) +### (2017-05-15) * added mock_tnt: doesn't destroy blocks, can coexist with regular tnt mod (all tnt is replaced with mock_tnt if tnt is disabled). This mod is helpful for when multiplayer servers have tnt disabled but players have acquired 'unknown item' (tnt:tnt) as loot. The Unknown Explosive says 'unknown item' on it, as a seemless replacement :) -(2017-04-20) +### (2017-04-20) * Released ENLIVEN 0.4.15.3 -(2017-04-02) +### (2017-04-02) * changed maximum range from 20 to 30 for forcefield (see technic/machines folder) * switched from kaeza to minetest-mods github repo for xban2 * fixed issue with redundant aliases in cme_to_spawners (see Mods,WIP folder) -(2017-03-08) +### (2017-03-08) * renamed the files in tenplus1's hud_hunger to use its nosprint version of lua files in hud_hunger/hunger * switched to hudbars, removed hud_hunger. Add line to SERVER's minetest.conf (using installer script): hubars_bar_type = statbar_modern -(2017-03-07) +### (2017-03-07) * change to tenplus1's hud_hunger fork (BlockMen's has potential comparison of number to nil [crash] in hud/builtin.lua line 79, other issues, and is not maintained) -(2017-03-06) +### (2017-03-06) * remove computer-specific settings from minetest.conf (client version in this folder) * remove ENLIVEN's copy of protector since TenPlus1 applied the fixes in the real repo -(2017-02-22) +### (2017-02-22) * NOTE: the protector fix from 2017-02-15 was merged by TenPlus1 today * Fix protector crash (also sent to TenPlus1): ```lua @@ -208,7 +214,7 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn end -- ADDED THIS LINE return true ``` -(2017-02-15) +### (2017-02-15) * (change bones) Show player (and print to server console) where died (and say bones remain or why not) -- with this addition, you can search your server log for "player's bones" where player is playername whether bones remain or not. * (change homedecor_modpack/homedecor) Add optional non-adult beverage version of homedecor in homedecor_modpack (just changes display name & variable name of Wine rack and Beer tap and beer mug, and textures for beer mug) * (change protector) Avoid crash by not allowing non-player to dig protected area (may only happen when one of the owners of an area does it--that was the crash scenario) @@ -216,9 +222,9 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn return protector.can_dig(1, pos, player:get_player_name(), true, 1) to return player and protector.can_dig(1, pos, player:get_player_name(), true, 1) or false -(2017-02-14) +### (2017-02-14) * (change mobs) Added some nonviolent textures that could be used in a school to the ENLIVEN/mods folder (they can be manually installed after ENLIVEN by copying them to the same place in your games/ENLIVEN folder on your installation of Minetest) -(2017-02-06) +### (2017-02-06) * Added optional mods for migrating from cme and from tsm_pyramids to spawners (should allow mods that depend on cme to be installed, and use mobs instead, though no mods in ENLIVEN are known to require cme currently) * Added optional trm_compassgps so that treasure could include a compass or map from the compassgps mod * Added installation of trmp_minetest_game to the installer script, since treasurer requires one or more trms in order to work (tested and working now on tsm_railcorridors) @@ -240,14 +246,9 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn add the new line (not sure if the format call is really ok--it was copied from compassgps: minetest.chat_send_player(player:get_player_name(), S("Bones placed at %s."):format(pos)) -### Potential mods to add -* weather: https://github.com/Jeija/minetest-mod-weather ( https://forum.minetest.net/viewtopic.php?t=5245 ) -* Immersive Sounds [ambience]: https://forum.minetest.net/viewtopic.php?t=2807 - OR technic_ambience: http://realbadangel.pl/technic_ambience.zip -* baked clay (Ethereal NG integrates with it, mobs redo, and farming redo) -* Updated pipeworks fork by HybridDog: https://github.com/HybridDog/pipeworks - ## Known issues: +* neither type of shears work on mobs redo sheep--though mobs:shears (Steel Shears) are supposed to via right-click: https://github.com/tenplus1/mobs_redo +* tsm_railcorridors only has cobwebs if mobs_monster is installed (but I may want to switch to minetest-mods' mob-engine https://github.com/minetest-mods/mob-engine.git which is a fork of cme) * spawners to spawners modpack transitional mod included here does not transition dungeon spawners such as `spawners:mobs_stone_monster_spawner_waiting` (in private test world near (?, -1458, -12) * worlds made with older version of enliven use Echoes' throwing, so the following differences must be fixed possibly with a new mod: * Old throwing items that are not in throwing_arrows: diff --git a/etc/game-install-ENLIVEN b/etc/game-install-ENLIVEN index c7ab246..cb54191 100755 --- a/etc/game-install-ENLIVEN +++ b/etc/game-install-ENLIVEN @@ -21,31 +21,7 @@ sudo echo "starting ENLIVEN installer script..." -## this space was intentinally left blank - - -if [ ! -f "`command -v minetestmapper`" ]; then - if [ -f "`command -v apt`" ]; then - sudo apt -y install libgd-dev libsqlite3-dev libleveldb-dev libhiredis-dev libpq-dev - else - if [ -f "`command -v pacman`" ]; then - pacman -Syyu --noconfirm gd sqlite leveldb hiredis postgresql #postgresql-libs - fi - fi - cd ~/Downloads - if [ -d minetestmapper ]; then - rm -Rf minetestmapper - fi - git clone https://github.com/minetest/minetestmapper.git - cd minetestmapper - cmake . -DENABLE_LEVELDB=1 - make -j2 - if [ -f minetestmapper ]; then - sudo cp -f minetestmapper /usr/local/bin/ - else - echo "FAILED to compile minetestmapper--python version will be used" - fi -fi +## this space was intentionally left blank @@ -149,6 +125,7 @@ else echo "You must have pasted this into terminal, so assuming MT_MYWORLD_NAME:" echo " $MT_MYWORLD_NAME" else + ls $MT_WORLDS_DIR read -p "Please enter a world [blank for $MT_DEFAULT_WORLD_NAME]: " MT_MYWORLD_NAME if [ -z "$MT_MYWORLD_NAME" ]; then MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" @@ -268,7 +245,7 @@ add_git_mod() sleep 1 exit 1 else - echo " added as $MTMOD_DEST_PATH" + echo " [ + ] added as $MTMOD_DEST_PATH" fi } @@ -279,21 +256,23 @@ remove_mod() MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME if [ -d "$MTMOD_DEST_PATH" ]; then sudo rm -Rf "$MTMOD_DEST_PATH" - fi - if [ -d "$MTMOD_DEST_PATH" ]; then - echo " ERROR in remove_mod: failed to remove $MTMOD_DEST_PATH, so cannot continue." > $err_txt - cat $err_txt - echo " press Ctrl C to cancel ENLIVEN install or this terminal will close..." - sleep 1 - echo " 3..." - sleep 1 - echo " 2..." - sleep 1 - echo " 1..." - sleep 1 - exit 1 + if [ -d "$MTMOD_DEST_PATH" ]; then + echo " ERROR in remove_mod: failed to remove $MTMOD_DEST_PATH, so cannot continue." > $err_txt + cat $err_txt + echo " press Ctrl C to cancel ENLIVEN install or this terminal will close..." + sleep 1 + echo " 3..." + sleep 1 + echo " 2..." + sleep 1 + echo " 1..." + sleep 1 + exit 1 + else + echo " [ - ] removed $MTMOD_DEST_PATH" + fi else - echo " removed $MTMOD_DEST_PATH" + echo " [ - ] already not present: $MTMOD_DEST_PATH" fi } @@ -306,9 +285,34 @@ remove_mod() -## this space was intentinally left blank +## this space was intentionally left blank + + +if [ ! -f "`command -v minetestmapper`" ]; then + if [ -f "`command -v apt`" ]; then + sudo apt -y install libgd-dev libsqlite3-dev libleveldb-dev libhiredis-dev libpq-dev + else + if [ -f "`command -v pacman`" ]; then + pacman -Syyu --noconfirm gd sqlite leveldb hiredis postgresql #postgresql-libs + fi + fi + cd ~/Downloads + if [ -d minetestmapper ]; then + rm -Rf minetestmapper + fi + git clone https://github.com/minetest/minetestmapper.git + cd minetestmapper + cmake . -DENABLE_LEVELDB=1 + make -j2 + if [ -f minetestmapper ]; then + sudo cp -f minetestmapper /usr/local/bin/ + else + echo "FAILED to compile minetestmapper--python version will be used" + fi +fi + if [ -d /tmp/local_mts_user ]; then # handle paranoia about directory with similar name rm -Rf /tmp/local_mts_user @@ -387,7 +391,7 @@ if [ -d "$USR_SHARE_MINETEST/games/minetest" ]; then # Arch linux mtgame_name="minetest" fi -sudo cp -R $USR_SHARE_MINETEST/games/$mtgame_name/* "$MT_MYGAME_DIR/" +sudo cp -Rf $USR_SHARE_MINETEST/games/$mtgame_name/* "$MT_MYGAME_DIR/" #wget https://github.com/BlockMen/cme/releases/download/v2.3/cme-2_3-BlockMen.zip #unzip cme-2_3-BlockMen.zip @@ -404,6 +408,12 @@ echo "load_mod_mobs_monster = true" >> "$WORLD_MT_PATH" add_git_mod mobs_animal mobs_animal https://github.com/tenplus1/mobs_animal.git echo "load_mod_mobs_animal = true" >> "$WORLD_MT_PATH" +add_git_mod sounding_line sounding_line https://github.com/minetest-mods/sounding_line.git +add_git_mod lightning lightning https://github.com/minetest-mods/lightning.git +add_git_mod mywalls mywalls https://github.com/minetest-mods/mywalls.git +add_git_mod mymasonhammer mymasonhammer https://github.com/minetest-mods/mymasonhammer.git +add_git_mod ts_furniture ts_furniture https://github.com/minetest-mods/ts_furniture.git + # forum_url="https://forum.minetest.net/viewtopic.php?f=11&t=9376" # author="tenplus1" # description="not the original 2012 protector or 2012 fork of 2012 protector; must be logged in to download protector.zip release version at https://forum.minetest.net/download/file.php?id=5046" @@ -433,7 +443,7 @@ echo "motd = \"Actions and chat messages are logged. Use inventory to see recipe echo "disallow_empty_passwords = true" >> "$WRITEABLE_MINETEST_CONF" echo "secure.trusted_mods = advanced_npc" >> "$WRITEABLE_MINETEST_CONF" echo "server_dedicated = false" >> "$WRITEABLE_MINETEST_CONF" -echo "hudbars_bar_type = statbar_modern" >> "$WRITEABLE_MINETEST_CONF" +echo "hudbars_bar_type = statbar_modern" >> "$WRITEABLE_MINETEST_CONF" #TODO: remove this after fully deprecated sudo mv -f $HOME/minetest.conf "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf" echo "load_mod_protector = true" >> "$WORLD_MT_PATH" @@ -496,6 +506,8 @@ sudo mv -f LICENSE "$MTMOD_DEST_PATH/" cd .. rmdir "$MTMOD_UNZ_NAME" +remove_mod sprint +remove_mod hudbars add_git_mod hbsprint hbsprint https://github.com/minetest-mods/hbsprint.git add_git_mod armor_monoid armor_monoid https://github.com/minetest-mods/armor_monoid.git @@ -562,11 +574,12 @@ remove_mod helicopter add_git_mod biome_lib biome_lib https://github.com/minetest-mods/biome_lib.git add_git_mod moretrees moretrees https://github.com/minetest-mods/moretrees.git add_git_mod 3d_armor minetest-3d_armor https://github.com/stujones11/minetest-3d_armor.git -#TODO 0.5 version??: https://github.com/stujones11/minetest-3d_armor/archive/MT_0.5.0-dev.zip +#TODO 0.5 version??: # Git 1.7.10 need `--single-branch` option to prevent getting all branches (see https://stackoverflow.com/questions/1911109/how-to-clone-a-specific-git-branch) #git clone -b MT_0.5.0-dev --single-branch https://git@github.com/stujones11/minetest-3d_armor.git #see also 0.5 branch https://github.com/stujones11/minetest-3d_armor/tree/MT_0.5.0-dev #"stable" version is at https://github.com/stujones11/minetest-3d_armor/archive/version-0.4.11.zip +#add_zip_mod 3d_armor minetest-3d_armor-MT_0.5.0-dev https://github.com/stujones11/minetest-3d_armor/archive/MT_0.5.0-dev.zip #mv minetest-3d_armor-master minetest-3d_armor_MODPACK #sudo mv minetest-3d_armor_MODPACK/wieldview $MT_MYGAME_MODS_PATH/wieldview @@ -576,9 +589,9 @@ add_git_mod 3d_armor minetest-3d_armor https://github.com/stujones11/minetest-3d echo "load_mod_3d_armor = true" >> "$WORLD_MT_PATH" #echo "load_mod_shields = true" >> "$WORLD_MT_PATH" #echo "load_mod_technic_armor = false" >> "$WORLD_MT_PATH" - -add_git_mod caverealms minetest-caverealms https://github.com/HeroOfTheWinds/minetest-caverealms - +#add_git_mod caverealms minetest-caverealms https://github.com/HeroOfTheWinds/minetest-caverealms +echo "Installing FaceDeer's v7-biome-integrated fork of HeroOfTheWinds' caverealms" +add_git_mod caverealms minetest-caverealms https://github.com/FaceDeer/minetest-caverealms.git #if [ -f "master.zip" ]; then #rm master.zip #fi @@ -670,59 +683,84 @@ add_zip_mod metatools minetest-mod-metatools-master https://github.com/expertmm/ #requires mobs redo add_zip_mod mobs_sky mobs_sky-master https://github.com/blert2112/mobs_sky/archive/master.zip -# forum_url: https://forum.minetest.net/viewtopic.php?f=11&t=13857 -# description: -# * REPLACES pyramids. -# * Works with mobs_redo and creatures. -# * optionally makes use of fire (in minetest_game; only uses fire:flint_and_steel), mobs, creatures, bones, xpanes (now part of minetest_game) -# * only RECIPES require fake_fire and xpanes -# * NOW (2017-2018) IS A MODPACK: formerly was a mod named spawners, now is a modpack containing: -# * spawners_env: appears in Dungeons and Temples (the pink stone ones); spawns hostile mobs; has small chance of spawning a spawner -# * spawners_mobs: spawns non-hostile mobs -# * spawners_ores: spawns ores -#add_zip_mod spawners minetest_gamers-spawners-* https://bitbucket.org/minetest_gamers/spawners/get/master.zip -add_git_mod spawners spawners https://bitbucket.org/minetest_gamers/spawners.git -MTMOD_DEST_NAME=spawners/spawners_ores -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ -d "$MTMOD_DEST_PATH" ]; then - echo "removing $MTMOD_DEST_NAME..." - sudo rm -Rf "$MTMOD_DEST_PATH" +spawners_enable="false" +if [ "$spawners_enable" = "true" ]; then + # forum_url: https://forum.minetest.net/viewtopic.php?f=11&t=13857 + # description: + # * REPLACES pyramids. + # * Works with mobs_redo and creatures. + # * optionally makes use of fire (in minetest_game; only uses fire:flint_and_steel), mobs, creatures, bones, xpanes (now part of minetest_game) + # * only RECIPES require fake_fire and xpanes + # * NOW (2017-2018) IS A MODPACK: formerly was a mod named spawners, now is a modpack containing: + # * spawners_env: appears in Dungeons and Temples (the pink stone ones); spawns hostile mobs; has small chance of spawning a spawner + # * spawners_mobs: spawns non-hostile mobs + # * spawners_ores: spawns ores + #add_zip_mod spawners minetest_gamers-spawners-* https://bitbucket.org/minetest_gamers/spawners/get/master.zip + add_git_mod spawners spawners https://bitbucket.org/minetest_gamers/spawners.git + MTMOD_DEST_NAME=spawners/spawners_ores + MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME + if [ -d "$MTMOD_DEST_PATH" ]; then + echo "removing $MTMOD_DEST_NAME..." + sudo rm -Rf "$MTMOD_DEST_PATH" + else + echo "ERROR: could not find $MTMOD_DEST_PATH for removal, so cancelling ENLIVEN install" + echo " press Ctrl C to cancel ENLIVEN install or this terminal will close..." + sleep 1 + echo " 3..." + sleep 1 + echo " 2..." + sleep 1 + echo " 1..." + sleep 1 + exit 1 + fi + if [ -d "$MTMOD_DEST_PATH" ]; then + echo "ERROR: could not remove $MTMOD_DEST_PATH for removal, so cancelling ENLIVEN install" + echo " press Ctrl C to cancel ENLIVEN install or this terminal will close..." + sleep 1 + echo " 3..." + sleep 1 + echo " 2..." + sleep 1 + echo " 1..." + sleep 1 + exit 1 + fi + + #defaults are: + #SPAWN_PYRAMIDS = false + #SPAWNERS_GENERATE = true + #CHESTS_GENERATE = false + MTMOD_DEST_NAME=spawners/spawners_env + MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME + echo "SPAWN_PYRAMIDS = true" > settings.txt + echo "SPAWNERS_GENERATE = true" >> settings.txt + echo "CHESTS_GENERATE = false" >> settings.txt + sudo mv settings.txt "$MTMOD_DEST_PATH/" # formerly $MT_MYGAME_MODS_PATH/spawners/ + echo "NOTE: in spawners, only SPAWNERS_GENERATE or CHESTS_GENERATE, not both (SPAWNERS_GENERATE overrides) spawn in world for now. See thread for updated info: https://forum.minetest.net/viewtopic.php?f=11&t=13857&start=25" + echo "see also expertmm's game-install-enliven-testing-SPAWNERS_BOTH_DEBUG.txt" + + # NOTE: tsm_chests_dungeon supercedes dungeon_loot: + if [ -d "$MT_MYGAME_MODS_PATH/dungeon_loot" ]; then + echo "WARNING: tsm_chests_dungeon may not be compatible with dungeon_loot" + echo "press Ctrl C to cancel installing ENLIVEN" + sleep 2 + echo "4..." + sleep 1 + echo "3..." + sleep 1 + echo "2..." + sleep 1 + echo "1..." + sleep 1 + fi + add_git_mod tsm_chests_dungeon minetest_tsm_chests_dungeon http://repo.or.cz/minetest_tsm_chests_dungeon.git else - echo "ERROR: could not find $MTMOD_DEST_PATH for removal, so cancelling ENLIVEN install" - echo " press Ctrl C to cancel ENLIVEN install or this terminal will close..." - sleep 1 - echo " 3..." - sleep 1 - echo " 2..." - sleep 1 - echo " 1..." - sleep 1 - exit 1 -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: could not remove $MTMOD_DEST_PATH for removal, so cancelling ENLIVEN install" - echo " press Ctrl C to cancel ENLIVEN install or this terminal will close..." - sleep 1 - echo " 3..." - sleep 1 - echo " 2..." - sleep 1 - echo " 1..." - sleep 1 - exit 1 + remove_mod tsm_chests_dungeon + remove_mod spawners + add_git_mod tsm_pyramids tsm_pyramids http://repo.or.cz/minetest_pyramids/tsm_pyramids.git + add_git_mod loot loot https://github.com/minetest-mods/loot.git fi -#defaults are: -#SPAWN_PYRAMIDS = false -#SPAWNERS_GENERATE = true -#CHESTS_GENERATE = false -MTMOD_DEST_NAME=spawners/spawners_env -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -echo "SPAWN_PYRAMIDS = true" > settings.txt -echo "SPAWNERS_GENERATE = true" >> settings.txt -echo "CHESTS_GENERATE = true" >> settings.txt -sudo mv settings.txt "$MTMOD_DEST_PATH/" # formerly $MT_MYGAME_MODS_PATH/spawners/ -echo "NOTE: in spawners, only SPAWNERS_GENERATE or CHESTS_GENERATE, not both (SPAWNERS_GENERATE overrides) spawn in world for now. See thread for updated info: https://forum.minetest.net/viewtopic.php?f=11&t=13857&start=25" -echo "see also expertmm's game-install-enliven-testing-SPAWNERS_BOTH_DEBUG.txt" # forum_url: https://forum.minetest.net/viewtopic.php?t=12189 # description: Adds animations to the players' head @@ -784,8 +822,14 @@ add_zip_mod signs_lib signs_lib-master https://github.com/minetest-mods/signs_li # exit 1 #fi -add_git_mod farming farming https://github.com/tenplus1/farming.git +#add_git_mod farming farming https://github.com/tenplus1/farming.git +remove_mod farming +sudo cp -R $USR_SHARE_MINETEST/games/$mtgame_name/farming $MT_MYGAME_MODS_PATH/ +cp -Rf asdf +add_git_mod vote vote https://github.com/minetest-mods/vote.git +add_git_mod stamina stamina https://github.com/minetest-mods/stamina +add_git_mod crops crops https://github.com/minetest-mods/crops # forum_url="https://forum.minetest.net/viewtopic.php?f=11&t=10423" # Wuzzy's slimenodes mod (only available via /give command). # web view: http://repo.or.cz/w/minetest_slimenodes.git @@ -803,21 +847,6 @@ add_git_mod slimenodes slimenodes https://github.com/expertmm/slimenodes.git #fixed version with correct dye list for 0.4.16 (submitted pull request to ClockGen 2018-02-08): add_git_mod trmp_minetest_game trmp_minetest_game https://github.com/expertmm/trmp_minetest_game.git -# NOTE: tsm_chests_dungeon supercedes dungeon_loot: -if [ -d "$MT_MYGAME_MODS_PATH/dungeon_loot" ]; then - echo "WARNING: tsm_chests_dungeon may not be compatible with dungeon_loot" - echo "press Ctrl C to cancel installing ENLIVEN" - sleep 4 - echo "4..." - sleep 1 - echo "3..." - sleep 1 - echo "2..." - sleep 1 - echo "1..." - sleep 1 -fi -add_git_mod tsm_chests_dungeon minetest_tsm_chests_dungeon http://repo.or.cz/minetest_tsm_chests_dungeon.git # NOTE: a skin database is at http://minetest.fensta.bplaced.net/ # bell07's 2016 (FORK of Krock's fork of dmonty's) u_skins (u_skins is a skin GUI that works with unified_inventory, whereas other skin GUIs often use inventory++) diff --git a/etc/game-install-enliven-testing.sh b/etc/game-install-enliven-testing.sh deleted file mode 100644 index 5f5db8d..0000000 --- a/etc/game-install-enliven-testing.sh +++ /dev/null @@ -1,285 +0,0 @@ -echo "Installing Enliven TESTING patch (run this after game-install-enliven.sh)" -echo "* You have to manually paste the environment variable settings from the beginning of game-install-enliven.sh here, so you have them." -echo "* Only install these mods if you know what you are doing! These mods may become part of enliven later, but are not thoroughly tested for stability and compatibility. Thanks, expertmm." -echo "Known issues:" -echo "* advanced_npc: 0.4.15 git (Jan 2017) has error with advanced_npc even with secure.enable_security = false ()" -echo "* torches: removes ceiling torches" - -#TODO: -# * possibly add aliases for mobf_traders--Sokomine seems to indicate that this worldgen mod spawns the villagers manually: https://github.com/Sokomine/mg_villages/issues/5 -# * add splash icon AND splash background for Enliven subgame -# * clicking barrel just rotates it (destroying watever you had left in it) -# * try https://github.com/Sokomine/mines_with_shafts and see if has treasure -# * try https://github.com/Sokomine/village_gambit additional village type for mg_villages -# * merge /home and unifiedinventory home (and make both require home priv) - -#TODO for enliven main branch: -# * shift click to pull out maximum number of items you can create (such as multiple stacks of stairs from wood) -# * kick players at certain time intervals (if play span when logged in is not current play span, then kick) such as for schools -# * remove recipe for flint&steel (obsidian shard+Wrought Iron Ingot [default:steel_ingot]) -# * detect whether tnt is disabled, and make obtaining it obtain a note or something (or somehow disable spawning of item in rail corridor chests where I found some) -# * rename minetest-chunkymap to minetestoffline or something -# * add recommended minetest.conf settings (provide python script to test, requiring minetestoffline) -# * analyze game-install-enliven-testing-FULLDEBUG.txt -# * possibly disable fire:flint_and_steel usage other than fake fire (fake fire fork used is in homedecor_modpack) -# * make spawners have drops -- similar drops as [cme] creatures:*_spawner -# * test whether abandoned mines will still be littered with empty chests if CHESTS_GENERATE or SPAWNERS_GENERATE instead of both are on in settings.txt in spawners mod folder (mine chests had stuff before adding spawners mod [mobs mod had been added]) -# * make bones write where&whose bones were placed to log (see "dungeon spawner placed at" in spawners for lua example) -# * resolve mg_villages error: -#2017-01-30 03:08:37: ERROR[Main]: ServerError: AsyncErr: ServerThread::run Lua: Runtime error from mod 'default' in callback item_OnPlace(): ...e/minetest/games/enliven/mods/mg_villages/protection.lua:215: attempt to concatenate field 'mts_path' (a nil value) -#2017-01-30 03:08:37: ERROR[Main]: stack traceback: -#2017-01-30 03:08:37: ERROR[Main]: ...e/minetest/games/enliven/mods/mg_villages/protection.lua:215: in function 'on_rightclick' -#2017-01-30 03:08:37: ERROR[Main]: ...ocal/share/minetest/games/enliven/mods/default/torch.lua:67: in function <...ocal/share/minetest/games/enliven/mods/default/#torch.lua:61> -#2017-01-30 03:08:37: ACTION[Server]: singleplayer leaves game. List of players: -#2017-01-30 03:08:37: ACTION[Main]: [fishing] Server shuts down. saving trophies table -# * resolve issue where signslib uses small Helvetica Narrow font even if extrafonts is used properly by 31px/* (largest) being copied to signslib/textures/ (see below) -# * check whether special_picks large picks can break protection -# * change uses of maxwear=x to uses=1/x as per minetest server startup warnings: plantlife_modpack/vines/shear.lua and worldedit_commands/wand.lua -# * sometimes sorting compassgps by location crashes (only on the included user file named yelby in the etc folder) -if [ ! -d "$MT_MYGAME_MODS_PATH" ]; then - echo "bad MT_MYGAME_MODS_PATH=$MT_MYGAME_MODS_PATH, so you must be doing it wrong." - exit 1 -fi -#used by mg_villages fork by Sokomine -cd $HOME/Downloads -MTMOD_SRC_ZIP=handle_schematics.zip -MTMOD_UNZ_NAME=handle_schematics-master -MTMOD_DEST_NAME=handle_schematics -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -if [ -f $MTMOD_SRC_ZIP ]; then - rm -f $MTMOD_SRC_ZIP -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -wget -O $MTMOD_SRC_ZIP https://github.com/Sokomine/handle_schematics/archive/master.zip -unzip "$MTMOD_SRC_ZIP" -sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." - exit 1 -fi - - -#https://forum.minetest.net/viewtopic.php?t=14359 -#This mod is part of minetest_game 0.4.15! -#With exception of the wieldlight -#cd $HOME/Downloads -#MTMOD_SRC_ZIP=torches.zip -#MTMOD_UNZ_NAME=torches-master -#MTMOD_DEST_NAME=torches -#MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -#if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable -# rm -Rf $MTMOD_UNZ_NAME -#fi -#if [ -f $MTMOD_SRC_ZIP ]; then -# rm -f $MTMOD_SRC_ZIP -#fi -#if [ -d "$MTMOD_DEST_PATH" ]; then -# sudo rm -Rf "$MTMOD_DEST_PATH" -#fi -#wget -O $MTMOD_SRC_ZIP https://github.com/BlockMen/torches/archive/master.zip -#unzip "$MTMOD_SRC_ZIP" -#sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -#if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." -# exit 1 -#fi - - -cd $HOME/Downloads -MTMOD_SRC_ZIP=moresnow.zip -MTMOD_UNZ_NAME=moresnow-master -MTMOD_DEST_NAME=moresnow -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -if [ -f $MTMOD_SRC_ZIP ]; then - rm -f $MTMOD_SRC_ZIP -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -wget -O $MTMOD_SRC_ZIP https://github.com/Sokomine/moresnow/archive/master.zip -unzip "$MTMOD_SRC_ZIP" -sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." - exit 1 -fi - - - -echo "Installing adrido's (NOT MasterGollum's which is incompatible with moreblocks) darkage..." -#linked from MasterGollum's: https://forum.minetest.net/viewtopic.php?id=3213 -cd $HOME/Downloads -MTMOD_SRC_ZIP=darkage.zip -MTMOD_UNZ_NAME=darkage-master -MTMOD_DEST_NAME=darkage -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -if [ -f $MTMOD_SRC_ZIP ]; then - rm -f $MTMOD_SRC_ZIP -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -wget -O $MTMOD_SRC_ZIP https://github.com/adrido/darkage/archive/master.zip -unzip "$MTMOD_SRC_ZIP" -sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." - exit 1 -fi - -cd $HOME/Downloads -MTMOD_SRC_ZIP=cottages.zip -MTMOD_UNZ_NAME=cottages-master -MTMOD_DEST_NAME=cottages -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -if [ -f $MTMOD_SRC_ZIP ]; then - rm -f $MTMOD_SRC_ZIP -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -wget $MTMOD_SRC_ZIP https://github.com/Sokomine/cottages/archive/master.zip -unzip "$MTMOD_SRC_ZIP" -sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." - exit 1 -fi - - - -cd $HOME/Downloads -MTMOD_SRC_ZIP=advanced_npc.zip -MTMOD_UNZ_NAME=advanced_npc-master -MTMOD_DEST_NAME=advanced_npc -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -if [ -f $MTMOD_SRC_ZIP ]; then - rm -f $MTMOD_SRC_ZIP -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -wget -O $MTMOD_SRC_ZIP https://github.com/hkzorman/advanced_npc/archive/master.zip -unzip "$MTMOD_SRC_ZIP" -sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." - exit 1 -fi - - -#forum post (special_picks by cx384): https://forum.minetest.net/viewtopic.php?f=11&t=9574 -cd $HOME/Downloads -MTMOD_SRC_ZIP=special_picks.zip -MTMOD_UNZ_NAME=special_picks-master -MTMOD_DEST_NAME=special_picks -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -if [ -f $MTMOD_SRC_ZIP ]; then - rm -f $MTMOD_SRC_ZIP -fi -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -wget -O $MTMOD_SRC_ZIP https://github.com/cx384/special_picks/archive/master.zip -unzip "$MTMOD_SRC_ZIP" -sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." - exit 1 -fi - - -# no longer needed since ENLIVEN main branch now uses expertmm travelnet: -#cd $HOME/Downloads -#MTMOD_SRC_ZIP=travelnet.zip -#MTMOD_UNZ_NAME=travelnet-master -#MTMOD_DEST_NAME=travelnet -#MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -#if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable -# rm -Rf $MTMOD_UNZ_NAME -#fi -#if [ -f $MTMOD_SRC_ZIP ]; then -# rm -f $MTMOD_SRC_ZIP -#fi -#if [ -d "$MTMOD_DEST_PATH" ]; then -# sudo rm -Rf "$MTMOD_DEST_PATH" -#fi -#wget -O $MTMOD_SRC_ZIP https://github.com/Sokomine/travelnet/archive/master.zip -#unzip "$MTMOD_SRC_ZIP" -#sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" - - - - -cd "$HOME/Downloads" -#does NOT have a zip extension when downloaded via wget: -MTMOD_SRC_ZIP=mesecons_modpack.zip -MTMOD_UNZ_NAME=mesecons-master -MTMOD_DEST_NAME=mesecons -MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable - rm -Rf $MTMOD_UNZ_NAME -fi -rm -Rf minetest-mods-mesecons-* -rm -Rf "" -if [ -f "$MTMOD_SRC_ZIP" ]; then - rm -f "$MTMOD_SRC_ZIP" -fi -wget -O $MTMOD_SRC_ZIP https://github.com/minetest-mods/mg/archive/master.zip -unzip $MTMOD_SRC_ZIP -if [ -d "$MTMOD_DEST_PATH" ]; then - sudo rm -Rf "$MTMOD_DEST_PATH" -fi -sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to create $MTMOD_DEST_PATH, so cannot continue." > $err_txt - cat $err_txt - sleep 3 - exit 1 -fi - -# no longer needed (?) since minetest-mods now maintains an mg with villages -#forum post (Sokomine's mg_villages provides villages for all mapgens and is based on is fork of Nores mg mapgen): https://forum.minetest.net/viewtopic.php?f=9&t=13116 -#cd $HOME/Downloads -#MTMOD_SRC_ZIP=mg_villages.zip -#MTMOD_UNZ_NAME=mg_villages-master -#MTMOD_DEST_NAME=mg_villages -#MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME -#if [ ! -z "`ls | grep $MTMOD_UNZ_NAME`" ]; then # works with wildcard in variable -# rm -Rf $MTMOD_UNZ_NAME -#fi -#if [ -f $MTMOD_SRC_ZIP ]; then -# rm -f $MTMOD_SRC_ZIP -#fi -#if [ -d "$MTMOD_DEST_PATH" ]; then -# sudo rm -Rf "$MTMOD_DEST_PATH" -#fi -#wget -O $MTMOD_SRC_ZIP https://github.com/Sokomine/mg_villages/archive/master.zip -#unzip "$MTMOD_SRC_ZIP" -#sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" -#if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." -# exit 1 -#fi - - diff --git a/etc/minetestserver-uninstall-git.sh b/etc/minetestserver-uninstall-git.sh index 657624c..267b450 100644 --- a/etc/minetestserver-uninstall-git.sh +++ b/etc/minetestserver-uninstall-git.sh @@ -37,10 +37,10 @@ sudo rmdir /usr/local/unix sudo rmdir /usr/local/builtin/* sudo rmdir /usr/local/builtin if [ -f "`command -v update-desktop-database`" ]; then - echo "updating desktop database as per https://aur.archlinux.org/minetest-git.git" + echo "updating desktop database as per https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=minetest-git" update-desktop-database &>/dev/null && update-desktop-database -q fi if [ -f "`command -v gtk-update-icon-cache`" ]; then - echo "updating gtk icon cache as per https://aur.archlinux.org/minetest-git.git" + echo "updating gtk icon cache as per https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=minetest-git" gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor fi