From 1137129c9252766fe8ef3b0017da9d5b577de546 Mon Sep 17 00:00:00 2001 From: Poikilos <7557867+poikilos@users.noreply.github.com> Date: Fri, 6 Mar 2026 23:54:24 -0500 Subject: [PATCH] Update lmk scripts. --- utilities/install-lmk | 3 ++- utilities/pull-lmk | 45 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/utilities/install-lmk b/utilities/install-lmk index e789175..2ee98f6 100755 --- a/utilities/install-lmk +++ b/utilities/install-lmk @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # #!/usr/bin/python3 # based on EnlivenMinetest/utilities/install-lmk @@ -15,6 +15,7 @@ Developers: If /opt/minebest/mtkit is present, that will be used. See hierosoft.hminetestsrc documentation for more info. ''' +from __future__ import print_function import re import sys import os diff --git a/utilities/pull-lmk b/utilities/pull-lmk index 3f09dd9..d631cdd 100755 --- a/utilities/pull-lmk +++ b/utilities/pull-lmk @@ -1,18 +1,53 @@ #!/bin/bash OFFLINE=false +UPDATE_MIRROR=false for var in "$@" do if [ "x$var" == "x--offline" ]; then OFFLINE=true + elif [ "x$var" == "x--update-mirror" ]; then + UPDATE_MIRROR=true fi done if [ -d "/opt/rjkbin" ]; then echo "Error: This should *not* be run on the server that has the master copy." exit 1 fi +if [ -f ~/.config/EnlivenMinetest/settings.rc ]; then + source ~/.config/EnlivenMinetest/settings.rc +else + >&2 echo "No ~/.config/EnlivenMinetest/settings.rc, using defaults." +fi +DEFAULT_MINEBEST_HOST=mtio +if [ -z "$MINEBEST_HOST" ]; then + MINEBEST_HOST=$DEFAULT_MINEBEST_HOST +fi +echo "MINEBEST_HOST=$MINEBEST_HOST" code= +if [ ! -d "/opt/minebest" ]; then +cat <