diff --git a/README.md b/README.md index 4c2b433..eff4ac9 100644 --- a/README.md +++ b/README.md @@ -83,17 +83,19 @@ world_path * Install the git version of minetest (or otherwise install 0.4.13 or other version compatible with the map generators used by chunkymap) such as: #if you have a version before 2016-03-23: - rm rename-deprecated.sh - wget https://github.com/expertmm/minetest-chunkymap/raw/master/rename-deprecated.sh - sudo sh rename-deprecated.sh + rm rename-deprecated.sh + wget https://github.com/expertmm/minetest-chunkymap/raw/master/rename-deprecated.sh + sudo sh rename-deprecated.sh -rm install-chunkymap-on-ubuntu-from-web.sh -wget https://github.com/expertmm/minetest-chunkymap/raw/master/install-chunkymap-on-ubuntu-from-web.sh -chmod +x install-chunkymap-on-ubuntu-from-web.sh -./install-chunkymap-on-ubuntu-from-web.sh + rm install-chunkymap-on-ubuntu-from-web.sh + wget https://github.com/expertmm/minetest-chunkymap/raw/master/install-chunkymap-on-ubuntu-from-web.sh + chmod +x install-chunkymap-on-ubuntu-from-web.sh + ./install-chunkymap-on-ubuntu-from-web.sh rm update-chunkymap-on-ubuntu-from-web.sh wget https://github.com/expertmm/minetest-chunkymap/raw/master/update-chunkymap-on-ubuntu-from-web.sh +sleep 1 chmod +x update-chunkymap-on-ubuntu-from-web.sh +./update-chunkymap-on-ubuntu-from-web.sh OPTION 2: IF you are using Ubuntu go to a terminal, cd to this directory, then switch user to the one that will run minetestserver (since install-chunkymap-on-ubuntu.sh DOES replace "/home/owner" with current user's home [replace-with-current-user.py, which is automatically called by install, will change /home/owner to current user's directory in each script that install copies to $HOME/chunkymap]) diff --git a/update-chunkymap-installer-only.sh b/update-chunkymap-installer-only.sh index 5965ccc..9083e64 100644 --- a/update-chunkymap-installer-only.sh +++ b/update-chunkymap-installer-only.sh @@ -1,8 +1,5 @@ #!/bin/sh cd $HOME -if [ -d "$HOME/minetest-stuff/minetest-chunkymap" ]; then - rm -Rf $HOME/minetest-stuff/minetest-chunkymap -fi CHUNKYMAP_INSTALLER_DIR=$HOME/Downloads/minetest-chunkymap if [ ! -d "$HOME/Downloads" ]; then mkdir "$HOME/Downloads" diff --git a/update-chunkymap-on-ubuntu-from-web.sh b/update-chunkymap-on-ubuntu-from-web.sh index 7ba41ea..b086361 100644 --- a/update-chunkymap-on-ubuntu-from-web.sh +++ b/update-chunkymap-on-ubuntu-from-web.sh @@ -5,13 +5,18 @@ CHUNKYMAP_DEST=$HOME/chunkymap if [ ! -d "$HOME/Downloads" ]; then mkdir "$HOME/Downloads" fi +if [ ! -d "$CHUNKYMAP_INSTALLER_DIR" ]; then + mkdir "$CHUNKYMAP_INSTALLER_DIR" +fi cd "$CHUNKYMAP_DEST" -rm update-chunkymap-installer-only.sh +if [ -f update-chunkymap-installer-only.sh ]; then + rm update-chunkymap-installer-only.sh +fi wget https://github.com/expertmm/minetest-chunkymap/blob/master/update-chunkymap-installer-only.sh +sleep 2 mv -f update-chunkymap-installer-only.sh $CHUNKYMAP_INSTALLER_DIR/ #Wait to make sure nothing weirdly not finished downloading: -sleep .2 cd $HOME #cd $CHUNKYMAP_INSTALLER_DIR #chmod +x update-chunkymap-installer-only.sh @@ -29,6 +34,6 @@ cd $HOME #else sh "$CHUNKYMAP_INSTALLER_DIR/update-chunkymap-installer-only.sh" #further instructions are in separate file in case updater was updated (sleep first otherwise file won't be finished writing): - sleep .2 + sleep 2 sh "$CHUNKYMAP_INSTALLER_DIR/post-update.sh" #fi