Browse Source

improved script detection

by putting everything in same folder
master
poikilos 9 years ago
committed by Jacob Gustafson
parent
commit
dd7dc31823
  1. 11
      chunkymap-regen.py
  2. 8
      install-chunkymap-on-ubuntu.sh
  3. 0
      minetestmapper-expertmm.py

11
chunkymap-regen.py

@ -516,11 +516,12 @@ class MTChunks:
if self.os_name=="windows":
self.minetestmapper_fast_sqlite_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-numpy.py")
self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper.py")
self.mt_chunkymap_path = os.path.join(self.mt_util_path, "chunkymap")
try_path = os.path.join(self.mt_chunkymap_path, "minetestmapper.py")
if os.path.isfile(try_path):
self.minetestmapper_custom_path = try_path
#self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper.py")
self.minetestmapper_custom_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "minetestmapper-expertmm.py")
#self.mt_chunkymap_path = os.path.join(self.mt_util_path, "chunkymap")
#try_path = os.path.join(self.mt_chunkymap_path, "minetestmapper.py")
#if os.path.isfile(try_path):
# self.minetestmapper_custom_path = try_path
self.minetestmapper_py_path = self.minetestmapper_fast_sqlite_path
if (self.backend_string!="sqlite3"):
self.minetestmapper_py_path = self.minetestmapper_custom_path

8
install-chunkymap-on-ubuntu.sh

@ -44,10 +44,10 @@ cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/chunkymap-cronjob" "$CHUNKYMAP_DEST/unus
cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/chunkymap-players-cronjob" "$CHUNKYMAP_DEST/unused/"
cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/set-minutely-players-crontab-job.sh" "$CHUNKYMAP_DEST/unused/"
cp -f "$CHUNKYMAP_INSTALLER_PATH/unused/set-minutely-crontab-job.sh" "$CHUNKYMAP_DEST/unused/"
if [ ! -d "$CHUNKYMAP_DEST/chunkymap" ]; then
mkdir "$CHUNKYMAP_DEST/chunkymap"
fi
cp -f "$CHUNKYMAP_INSTALLER_PATH/minetestmapper.py" "$CHUNKYMAP_DEST/chunkymap/"
#if [ ! -d "$CHUNKYMAP_DEST/chunkymap" ]; then
# mkdir "$CHUNKYMAP_DEST/chunkymap"
#fi
cp -f "$CHUNKYMAP_INSTALLER_PATH/minetestmapper-expertmm.py" "$CHUNKYMAP_DEST/"
cp --no-clobber $CHUNKYMAP_INSTALLER_PATH/chunkymap-signals* "$CHUNKYMAP_DEST/"
cd "$CHUNKYMAP_INSTALLER_PATH"
python replace-with-current-user.py # the py file only manipulates the minetest/util directory

0
minetestmapper.py → minetestmapper-expertmm.py

Loading…
Cancel
Save